c-zhouhf1/zhgh_jshvc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_jshvc

Browse Source
This commit is contained in:
=
2025-12-23 16:47:40 +08:00
parent ab56d15c82 967b8e7a8e
commit 2137d93232
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/controller/SysMenuController.java
+2 -2
View File
@@ -391,11 +391,11 @@ public class SysMenuController {
@At
@Ok("json")
@SaCheckPermission("sys.manager.menu.edit")
public Object sortDo(@Param("ids") String ids, HttpServletRequest req) {
public Object sortDo(@Param("ids") String ids, @Param("platform") String platform, HttpServletRequest req) {
try {
String[] menuIds = StringUtils.split(ids, ",");
int i = 0;
sysMenuService.execute(Sqls.create("update sys_menu set location=0"));
sysMenuService.execute(Sqls.create("update sys_menu set location=0 where platform = '%s'".formatted(platform)));
for (String s : menuIds) {
if (!Strings.isBlank(s)) {
sysMenuService.update(org.nutz.dao.Chain.make("location", i), Cnd.where("id", "=", s));
src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java
+3 -2
View File
@@ -79,8 +79,8 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl<ClubCommonPage
WHERE
scu.clubId = c.id
) currentNum,
presidentUser.username AS clubLeader,
secretaryUser.username AS clubSecretary
GROUP_CONCAT(DISTINCT presidentUser.username) AS clubLeader,
GROUP_CONCAT(secretaryUser.username) AS clubSecretary
FROM
sys_club c
LEFT JOIN club_user presidentCu on presidentCu.clubId = c.id AND JSON_CONTAINS(presidentCu.roleCode, '"CLUB_PRESIDENT"')
@@ -105,6 +105,7 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl<ClubCommonPage
cnd.and("c.id", "in", clubIdList);
}
cnd.groupBy("c.id");
cnd.asc("c.clubCode");
sql.setCondition(cnd);
return listPageVO(pageForm, sql, ClubCommonPageVo.class);
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java
+2 -2
View File
@@ -491,14 +491,14 @@ public class TeacherCongressDelegateManageController {
for (Teacher_congress_delegate delegate : delegateList) {
Teacher_congress_delegation_unit delegation_unit = dao.fetch(Teacher_congress_delegation_unit.class,
Cnd.where(Teacher_congress_delegation_unit::getUnitId, "=", delegate.getUnitId())
.and(Teacher_congress_delegation_union::getSessionId, "=", sessionId));
.and(Teacher_congress_delegation_unit::getSessionId, "=", sessionId));
if (ObjectUtil.isNotEmpty(delegation_unit)) {
delegate.setDelegationId(delegation_unit.getDelegationId());
dao.update(delegate);
Sys_user_role userRole = new Sys_user_role();
userRole.setTcDelegationId(delegation_unit.getDelegationId());
userRole.setUserId(delegate.getUserId());
userRole.setTcSessionId(delegate.getSessionId());
userRole.setTcSessionId(sessionId);
Sys_role sys_role = dao.fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name()));
if (sys_role.getId().equals(delegate.getRoleId())) {
src/main/resources/views/platform/sys/menu/sort.js
+4 -2
View File
@@ -20,11 +20,13 @@ const SYS_MENU_SORT_COMPONENT = {
defaultProps: {
children: "children",
label: "label"
}
},
platform: 'PC'
}
},
methods: {
onOpen(platform) {
this.platform = platform
this.sortDialogVisible = true
this.$axios.post("/platform/sys/menu/menuAll", { platform }).then((res) => {
if (res.code === 0) {
@@ -48,7 +50,7 @@ const SYS_MENU_SORT_COMPONENT = {
})
this.getTreeIds(ids, this.sortMenuData)
this.$axios
.post("/platform/sys/menu/sortDo", { ids: ids.toString() })
.post("/platform/sys/menu/sortDo", { ids: ids.toString(), platform: this.platform })
.then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)