commit

src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java

@@ -347,11 +347,14 @@ public class FamilyActivityApplyController {
 	public Result doSignUp(FamilyUser familyUser) {
 		try {
 			lock.lock();
+			FamilyActivity activity = dao.fetch(FamilyActivity.class, familyUser.getActivityId());
+			if(Lang.isEmpty(familyUser.getMobileColumnsValue())) {
+				return Result.error(99,"请填写" + activity.getKeyWord() + "信息");
+			}
 			boolean courseByUser = familyActivityService.isSignCourseByUser(familyUser.getCourseId(), SecurityUtil.getUserId());
 			if(courseByUser) {
 				return Result.error(99,"您已报过该活动");
 			}
-			FamilyActivity activity = familyActivityService.fetch(familyUser.getActivityId());
 			boolean validFamilyCount = familyActivityService.validFamilyCount(familyUser);
 			if(validFamilyCount) {
 				return Result.error(99,activity.getKeyWord() + "人数最多为" + activity.getFamilyMaxCount());

src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityStatisticsServiceImpl.java

@@ -98,7 +98,7 @@ public class FamilyActivityStatisticsServiceImpl extends BaseServiceImpl<FamilyU
 					family_user tsuu
 					LEFT JOIN `vw_user` u ON u.id = tsuu.userId
 				$condition
-				ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
+				ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),tsuu.signUpTime desc,u.unionid desc, u.unitid desc
 				""");
 		Cnd cnd = Cnd.NEW();
 		cnd.andEX("tsuu.courseId", "=", courseId);
@@ -150,7 +150,7 @@ public class FamilyActivityStatisticsServiceImpl extends BaseServiceImpl<FamilyU
 					family_user tsuu
 					LEFT JOIN `vw_user` u ON u.id = tsuu.userId
 				$condition
-				ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
+				ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),tsuu.signUpTime desc,u.unionid desc, u.unitid desc
 				""");
 		Cnd cnd = Cnd.NEW();
 		cnd.andEX("tsuu.courseId", "=", courseId);

src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java

@@ -97,7 +97,7 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
                 	train_sign_up_user tsuu
                 	LEFT JOIN `vw_user` u ON u.id = tsuu.userId
                 $condition
-                ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
+                ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),tsuu.signUpTime desc,u.unionid desc, u.unitid desc
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.andEX("tsuu.courseId", "=", courseId);
@@ -143,7 +143,7 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl<Tr
                 	train_sign_up_user tsuu
                 	LEFT JOIN `vw_user` u ON u.id = tsuu.userId
                 $condition
-                ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
+                ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),tsuu.signUpTime desc,u.unionid desc, u.unitid desc
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.andEX("tsuu.courseId", "=", courseId);

src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalApplyController.java

@@ -1,23 +1,34 @@
 package com.budwk.app.zhgh.staffbenefit.legal.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.staffbenefit.legal.model.LegalApply;
 import com.budwk.app.zhgh.staffbenefit.legal.service.LegalApplyService;
+import com.budwk.app.zhgh.staffbenefit.psychology.model.PsychologyApply;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 
+import java.util.List;
+
 /**
  * @ClassName LegalApplyController
  * @Author JyuHsin
@@ -37,17 +48,23 @@ public class LegalApplyController {
 	@Inject
 	private LegalApplyService applyService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("legal.apply")
 	@Ok("beetl:/platform/zhgh/staffbenefit/legal/apply/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.legal.apply")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/legal/apply/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("新增/修改法律援助预约")
-	@SaCheckPermission("legal.apply")
+	@SaCheckPermission(value = {"legal.apply", "h5.legal.apply"}, mode = SaMode.OR)
 	@SLog(tag = "法律援助系统-援助申请", msg = "新增/修改法律援助预约")
-	public Object onSubmit(LegalApply apply) {
+	public Object submit(LegalApply apply) {
 		LegalApply legalApply = applyService.fetch(apply.getId());
 		if(StrUtil.isNotBlank(legalApply.getUserId())) {
 			return Result.error("该时段已被预约");
@@ -68,4 +85,39 @@ public class LegalApplyController {
 		//TODO：这里后面要加发短信
 		return Result.success();
 	}
+
+	@At
+	@ApiOperation("移动端预约查询咨询师")
+	@SaCheckPermission(value = {"legal.apply", "h5.legal.apply"}, mode = SaMode.OR)
+	@SLog(tag = "法律援助系统-移动端预约查询咨询师", msg = "移动端预约查询咨询师")
+	public Object h5PageData(PageForm pageForm, String sex) {
+		Sql sql = Sqls.create("""
+                SELECT
+                	pd.*
+                FROM
+                	legal_doctor pd
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		cnd.and(Cnd.likeEX("pd.sex", sex));
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or("pd.userName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("pd.loginName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		sql.setCondition(cnd);
+		Pagination pagination = applyService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		List<NutMap> list = pagination.getList(NutMap.class);
+		for (NutMap nutMap : list) {
+			List<LegalApply> applyList = dao.query(
+					LegalApply.class,
+					Cnd.where(LegalApply::getDoctorUser, "=", nutMap.getString("userId"))
+							.and(LegalApply::getStartTime, ">=", DateUtil.now())
+							.and(LegalApply::getUserId, "is", null)
+			);
+			nutMap.put("times", applyList);
+		}
+		return Result.success(pagination);
+	}
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalListController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.legal.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -42,15 +43,21 @@ public class LegalListController {
 	@Inject
 	private LegalApplyService applyService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("legal.list")
 	@Ok("beetl:/platform/zhgh/staffbenefit/legal/list/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.legal.list")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/legal/list/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("legal.list")
+	@SaCheckPermission(value = {"legal.list", "h5.legal.list"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year) {
 		Sql sql = Sqls.create("""
@@ -87,9 +94,9 @@ public class LegalListController {
 
 	@At
 	@ApiOperation("删除法律援助预约")
-	@SaCheckPermission("legal.list")
+	@SaCheckPermission(value = {"legal.list", "h5.legal.list"}, mode = SaMode.OR)
 	@SLog(tag = "法律援助系统-法律援助预约", msg = "删除法律援助预约")
-	public Object onDelete(String id) {
+	public Object delete(String id) {
 		LegalApply apply = applyService.fetch(id);
 		apply.setUserId(null);
 		apply.setLoginName(null);

src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalOnlinePostController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.legal.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -50,15 +51,21 @@ public class LegalOnlinePostController {
 	@Inject
 	private BaseService baseService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("legal.onlinePost")
 	@Ok("beetl:/platform/zhgh/staffbenefit/legal/onlinePost/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.legal.onlinePost")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/legal/onlinePost/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("legal.onlinePost")
+	@SaCheckPermission(value = {"legal.onlinePost", "h5.legal.onlinePost"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "isReply") Boolean isReply) {
@@ -78,6 +85,7 @@ public class LegalOnlinePostController {
 		cnd.andEX("YEAR(pop.postingTime)", "=", year);
 		cnd.groupBy("pop.id");
 		cnd.having(Cnd.where("count(por.id)", isReply == null ? ">=" : isReply ? ">" : "=", 0));
+		cnd.desc("pop.postingTime");
 		sql.setCondition(cnd);
 		Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
 		return Result.success(pagination);
@@ -85,9 +93,9 @@ public class LegalOnlinePostController {
 
 	@At
 	@ApiOperation("新增/修改法律援助线上发帖")
-	@SaCheckPermission("legal.onlinePost")
+	@SaCheckPermission(value = {"legal.onlinePost", "h5.legal.onlinePost"}, mode = SaMode.OR)
 	@SLog(tag = "法律援助系统-线上发帖", msg = "新增/修改法律援助线上发帖")
-	public Object onSubmit(LegalOnlinePost post) {
+	public Object submit(LegalOnlinePost post) {
 		if(StrUtil.isBlank(post.getId())) {
 			View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
 			post.setPoster(user.getId());
@@ -106,16 +114,16 @@ public class LegalOnlinePostController {
 
 	@At
 	@ApiOperation("删除法律援助线上发帖")
-	@SaCheckPermission("legal.onlinePost")
+	@SaCheckPermission(value = {"legal.onlinePost", "h5.legal.onlinePost"}, mode = SaMode.OR)
 	@SLog(tag = "法律援助系统-线上发帖", msg = "删除法律援助线上发帖")
-	public Object onDelete(String id) {
+	public Object delete(String id) {
 		dao.delete(LegalOnlinePost.class, id);
 		return Result.success();
 	}
 
 	@At
 	@ApiOperation("查询法律援助线上发帖")
-	@SaCheckPermission("legal.onlinePost")
+	@SaCheckPermission(value = {"legal.onlinePost", "h5.legal.onlinePost"}, mode = SaMode.OR)
 	public Result fetchOne(String id) {
 		LegalOnlinePost onlinePost = dao.fetch(LegalOnlinePost.class, id);
 		List<LegalOnlineReply> replyList = dao.query(

src/main/java/com/budwk/app/zhgh/staffbenefit/legal/controller/LegalOnlineReplyController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.legal.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -48,15 +49,21 @@ public class LegalOnlineReplyController {
 	@Inject
 	private BaseService baseService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("legal.onlineReply")
 	@Ok("beetl:/platform/zhgh/staffbenefit/legal/onlineReply/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.legal.onlineReply")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/legal/onlineReply/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("legal.onlineReply")
+	@SaCheckPermission(value = {"legal.onlineReply", "h5.legal.onlineReply"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "isReply") Boolean isReply) {
@@ -86,9 +93,9 @@ public class LegalOnlineReplyController {
 
 	@At
 	@ApiOperation("新增/修改法律援助线上回复")
-	@SaCheckPermission("legal.onlineReply")
+	@SaCheckPermission(value = {"legal.onlineReply", "h5.legal.onlineReply"}, mode = SaMode.OR)
 	@SLog(tag = "法律援助系统-线上回复", msg = "新增/修改法律援助线上回复")
-	public Object onSubmit(LegalOnlineReply reply) {
+	public Object submit(LegalOnlineReply reply) {
 		if (StrUtil.isBlank(reply.getId())) {
 			View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
 			reply.setReplyUserId(user.getId());
@@ -107,7 +114,7 @@ public class LegalOnlineReplyController {
 
 	@At
 	@ApiOperation("查询法律援助线上回复")
-	@SaCheckPermission("legal.onlineReply")
+	@SaCheckPermission(value = {"legal.onlineReply", "h5.legal.onlineReply"}, mode = SaMode.OR)
 	public Result fetchOne(String id) {
 		LegalOnlinePost onlinePost = dao.fetch(LegalOnlinePost.class, id);
 		List<LegalOnlineReply> replyList = dao.query(

src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyApplyController.java

@@ -1,11 +1,16 @@
 package com.budwk.app.zhgh.staffbenefit.psychology.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
 import com.budwk.app.zhgh.staffbenefit.psychology.model.PsychologyApply;
 import com.budwk.app.zhgh.staffbenefit.psychology.service.PsychologyApplyService;
 import io.swagger.annotations.Api;
@@ -13,11 +18,17 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 
+import java.util.List;
+
 /**
  * @ClassName PsychologyApplyController
  * @Author JyuHsin
@@ -37,17 +48,23 @@ public class PsychologyApplyController {
 	@Inject
 	private PsychologyApplyService applyService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("psychology.apply")
 	@Ok("beetl:/platform/zhgh/staffbenefit/psychology/apply/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.psychology.apply")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/psychology/apply/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("新增/修改心理咨询预约")
-	@SaCheckPermission("psychology.apply")
+	@SaCheckPermission(value = {"psychology.apply", "h5.psychology.apply"}, mode = SaMode.OR)
 	@SLog(tag = "心理咨询系统-心理咨询预约", msg = "新增/修改心理咨询预约")
-	public Object onSubmit(PsychologyApply apply) {
+	public Object submit(PsychologyApply apply) {
 		PsychologyApply psychologyApply = applyService.fetch(apply.getId());
 		if(StrUtil.isNotBlank(psychologyApply.getUserId())) {
 			return Result.error("该时段已被预约");
@@ -67,4 +84,39 @@ public class PsychologyApplyController {
 		//TODO：这里后面要加发短信
 		return Result.success();
 	}
+
+	@At
+	@ApiOperation("移动端预约查询咨询师")
+	@SaCheckPermission(value = {"psychology.apply", "h5.psychology.apply"}, mode = SaMode.OR)
+	@SLog(tag = "心理咨询系统-移动端预约查询咨询师", msg = "移动端预约查询咨询师")
+	public Object h5PageData(PageForm pageForm, String sex) {
+		Sql sql = Sqls.create("""
+                SELECT
+                	pd.*
+                FROM
+                	psychology_doctor pd
+                $condition
+                """);
+		Cnd cnd = Cnd.NEW();
+		cnd.and(Cnd.likeEX("pd.sex", sex));
+		if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+			SqlExpressionGroup seg = new SqlExpressionGroup();
+			seg.or("pd.userName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			seg.or("pd.loginName", "like", "%" + pageForm.getSearchKeyword() + "%");
+			cnd.and(seg);
+		}
+		sql.setCondition(cnd);
+		Pagination pagination = applyService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+		List<NutMap> list = pagination.getList(NutMap.class);
+		for (NutMap nutMap : list) {
+			List<PsychologyApply> applyList = dao.query(
+					PsychologyApply.class,
+					Cnd.where(PsychologyApply::getDoctorUser, "=", nutMap.getString("userId"))
+							.and(PsychologyApply::getStartTime, ">=", DateUtil.now())
+							.and(PsychologyApply::getUserId, "is", null)
+			);
+			nutMap.put("times", applyList);
+		}
+		return Result.success(pagination);
+	}
 }

src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyIndexController.java

@@ -1,67 +0,0 @@
-package com.budwk.app.zhgh.staffbenefit.psychology.controller;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.budwk.app.base.page.Pagination;
-import com.budwk.app.base.result.Result;
-import com.budwk.app.zhgh.staffbenefit.psychology.model.PsychologyDoctor;
-import com.budwk.app.zhgh.staffbenefit.psychology.service.PsychologyDoctorService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.nutz.dao.Cnd;
-import org.nutz.ioc.loader.annotation.Inject;
-import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.lang.Lang;
-import org.nutz.mvc.annotation.At;
-import org.nutz.mvc.annotation.Ok;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author zzr
- * @name：PsychologyIndexController
- * @Date 2025/9/12 10:54
- * @version 1.0
- * @注释
- */
-@Slf4j
-@IocBean
-@Ok("json:full")
-@Api(tags = "心理咨询")
-@At("/platform/psychology/index")
-public class PsychologyIndexController {
-
-    @Inject
-    private PsychologyDoctorService psychologyDoctorService;
-
-    @At("")
-//    @SaCheckPermission("psychology.index")
-    @Ok("beetl:/platform/zhgh/staffbenefit/psychology/index/index.html")
-    public void index() {
-    }
-
-    @At
-//    @SaCheckPermission("psychology.index")
-    @Ok("beetl:/platform/zhghh5/staffbenefit/psychology/index/index.html")
-    public void h5() {
-    }
-
-
-    @At
-    @ApiOperation("手机端咨询师列表展示")
-//    @SaCheckPermission("psychology.index")
-    public Result listConsultantByH5(){
-        Pagination<PsychologyDoctor> pagination = psychologyDoctorService.listPage(1, 4, Cnd.NEW());
-        List<PsychologyDoctor> list = pagination.getList();
-        // 判断有没有咨询师，并且咨询师数量小于4的话，要顺序填充到4个，便于前端展示
-        if (Lang.isNotEmpty(list) && list.size() < 4) {
-            List<PsychologyDoctor> filledList = new ArrayList<>(4);
-            for (int i = 0; i < 4; i++) {
-                filledList.add(list.get(i % list.size()));
-            }
-            pagination.setList(filledList);
-        }
-        return Result.success(pagination.getList());
-    }
-}

src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyListController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.psychology.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import com.budwk.app.base.annotation.SLog;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -43,15 +44,21 @@ public class PsychologyListController {
 	@Inject
 	private PsychologyApplyService applyService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("psychology.list")
 	@Ok("beetl:/platform/zhgh/staffbenefit/psychology/list/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.psychology.list")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/psychology/list/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("psychology.list")
+	@SaCheckPermission(value = {"psychology.list", "h5.psychology.list"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year) {
 		Sql sql = Sqls.create("""
@@ -88,9 +95,9 @@ public class PsychologyListController {
 
 	@At
 	@ApiOperation("删除心理咨询预约")
-	@SaCheckPermission("psychology.list")
+	@SaCheckPermission(value = {"psychology.list", "h5.psychology.list"}, mode = SaMode.OR)
 	@SLog(tag = "心理咨询系统-心理咨询预约", msg = "删除心理咨询预约")
-	public Object onDelete(String id) {
+	public Object delete(String id) {
 		PsychologyApply apply = applyService.fetch(id);
 		apply.setUserId(null);
 		apply.setLoginName(null);

src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyOnlinePostController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.psychology.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -50,15 +51,21 @@ public class PsychologyOnlinePostController {
 	@Inject
 	private BaseService baseService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("psychology.onlinePost")
 	@Ok("beetl:/platform/zhgh/staffbenefit/psychology/onlinePost/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.psychology.onlinePost")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/psychology/onlinePost/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("psychology.onlinePost")
+	@SaCheckPermission(value = {"psychology.onlinePost", "h5.psychology.onlinePost"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "isReply") Boolean isReply) {
@@ -78,6 +85,7 @@ public class PsychologyOnlinePostController {
 		cnd.andEX("YEAR(pop.postingTime)", "=", year);
 		cnd.groupBy("pop.id");
 		cnd.having(Cnd.where("count(por.id)", isReply == null ? ">=" : isReply ? ">" : "=", 0));
+		cnd.desc("pop.postingTime");
 		sql.setCondition(cnd);
 		Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
 		return Result.success(pagination);
@@ -85,9 +93,9 @@ public class PsychologyOnlinePostController {
 
 	@At
 	@ApiOperation("新增/修改心理咨询线上发帖")
-	@SaCheckPermission("psychology.onlinePost")
+	@SaCheckPermission(value = {"psychology.onlinePost", "h5.psychology.onlinePost"}, mode = SaMode.OR)
 	@SLog(tag = "心理咨询系统-线上发帖", msg = "新增/修改心理咨询线上发帖")
-	public Object onSubmit(PsychologyOnlinePost post) {
+	public Object submit(PsychologyOnlinePost post) {
 		if(StrUtil.isBlank(post.getId())) {
 			View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
 			post.setPoster(user.getId());
@@ -106,16 +114,16 @@ public class PsychologyOnlinePostController {
 
 	@At
 	@ApiOperation("删除心理咨询线上发帖")
-	@SaCheckPermission("psychology.onlinePost")
+	@SaCheckPermission(value = {"psychology.onlinePost", "h5.psychology.onlinePost"}, mode = SaMode.OR)
 	@SLog(tag = "心理咨询系统-线上发帖", msg = "删除心理咨询线上发帖")
-	public Object onDelete(String id) {
+	public Object delete(String id) {
 		dao.delete(PsychologyOnlinePost.class, id);
 		return Result.success();
 	}
 
 	@At
 	@ApiOperation("查询心理咨询线上发帖")
-	@SaCheckPermission("psychology.onlinePost")
+	@SaCheckPermission(value = {"psychology.onlinePost", "h5.psychology.onlinePost"}, mode = SaMode.OR)
 	public Result fetchOne(String id) {
 		PsychologyOnlinePost onlinePost = dao.fetch(PsychologyOnlinePost.class, id);
 		List<PsychologyOnlineReply> replyList = dao.query(

src/main/java/com/budwk/app/zhgh/staffbenefit/psychology/controller/PsychologyOnlineReplyController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.staffbenefit.psychology.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.annotation.SLog;
@@ -48,15 +49,21 @@ public class PsychologyOnlineReplyController {
 	@Inject
 	private BaseService baseService;
 
-	@At("")
+	@At("/")
 	@SaCheckPermission("psychology.onlineReply")
 	@Ok("beetl:/platform/zhgh/staffbenefit/psychology/onlineReply/index.html")
 	public void index() {
 	}
 
+	@At("/h5")
+	@SaCheckPermission("h5.psychology.onlineReply")
+	@Ok("beetl:/platform/zhghh5/staffbenefit/psychology/onlineReply/index.html")
+	public void h5Index() {
+	}
+
 	@At
 	@ApiOperation("分页查询")
-	@SaCheckPermission("psychology.onlineReply")
+	@SaCheckPermission(value = {"psychology.onlineReply", "h5.psychology.onlineReply"}, mode = SaMode.OR)
 	public Result pageData(PageForm pageForm,
 						   @Param(value = "year") Integer year,
 						   @Param(value = "isReply") Boolean isReply) {
@@ -86,9 +93,9 @@ public class PsychologyOnlineReplyController {
 
 	@At
 	@ApiOperation("新增/修改心理咨询线上回复")
-	@SaCheckPermission("psychology.onlineReply")
+	@SaCheckPermission(value = {"psychology.onlineReply", "h5.psychology.onlineReply"}, mode = SaMode.OR)
 	@SLog(tag = "心理咨询系统-线上回复", msg = "新增/修改心理咨询线上回复")
-	public Object onSubmit(PsychologyOnlineReply reply) {
+	public Object submit(PsychologyOnlineReply reply) {
 		if (StrUtil.isBlank(reply.getId())) {
 			View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()));
 			reply.setReplyUserId(user.getId());
@@ -107,7 +114,7 @@ public class PsychologyOnlineReplyController {
 
 	@At
 	@ApiOperation("查询心理咨询线上回复")
-	@SaCheckPermission("psychology.onlineReply")
+	@SaCheckPermission(value = {"psychology.onlineReply", "h5.psychology.onlineReply"}, mode = SaMode.OR)
 	public Result fetchOne(String id) {
 		PsychologyOnlinePost onlinePost = dao.fetch(PsychologyOnlinePost.class, id);
 		List<PsychologyOnlineReply> replyList = dao.query(