Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/common/xss/XssHttpServletRequestWrapper.java

@@ -29,7 +29,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
      */
     HttpServletRequest orgRequest;
 
-    private final List<String> ignoreXssUrl = ListUtil.toList("/magic-api/**");
+    private final List<String> ignoreXssUrl = ListUtil.toList("/magic-api/**","/magic/web/**");
     //html过滤
     private final static HTMLFilter HTML_FILTER = new HTMLFilter();
 

src/main/java/com/xjrsoft/config/CommonPropertiesConfig.java

@@ -31,6 +31,11 @@ public class CommonPropertiesConfig {
      */
     private String domainWeb;
 
+    /**
+     * app域名地址
+     */
+    private String domainApp;
+
     private List<String> excludeUrls;
 
     private List<String> whiteList;

src/main/java/com/xjrsoft/module/oa/utils/SendMessageUtil.java

@@ -13,6 +13,7 @@ import com.xjrsoft.common.sms.SmsSender;
 import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.common.utils.RedisUtil;
 import com.xjrsoft.common.utils.WeChatUtil;
+import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.module.oa.entity.Message;
 import com.xjrsoft.module.oa.service.IMessageService;
 import com.xjrsoft.module.organization.entity.User;
@@ -71,6 +72,8 @@ public class SendMessageUtil {
 
         WeChatUtil weChatUtil = SpringUtil.getBean(WeChatUtil.class);
 
+        CommonPropertiesConfig cpConfig = SpringUtil.getBean(CommonPropertiesConfig.class);
+
         //获取用户相关信息
         List<User> userList = redisUtil.get(GlobalConstant.USER_CACHE_KEY, new TypeReference<List<User>>() {
         });
@@ -112,7 +115,7 @@ public class SendMessageUtil {
                 object.put("template_id", "sHsmz7LRj7HLd7GSTS3r2jCLvK-4Wp19iGzEvYK8n_I");
                 object.put("miniprogram", new JSONObject() {{
                     put("appid", weChatUtil.getAppletAppKey());
-                    put("pagepath", StrUtil.format("/xjrsoft/pages/workflow/approval?taskId={}&processId={}&type=todo", param.getTaskId(), param.getProcessId()));
+                    put("pagepath", StrUtil.format("{}/xjrsoft/pages/workflow/approval?taskId={}&processId={}&type=todo",cpConfig.getDomainApp(), param.getTaskId(), param.getProcessId()));
                 }});
                 object.put("client_msg_id", param.getTaskId());
                 object.put("data", data);

src/main/java/com/xjrsoft/module/student/controller/ClassHonorsController.java

@@ -61,6 +61,8 @@ public class ClassHonorsController {
     @ApiOperation(value="班级荣誉列表(分页)")
     @SaCheckPermission("classhonors:detail")
     public RT<PageOutput<ClassHonorsPageVo>> page(@Valid ClassHonorsPageDto dto){
+        //为保证返回给前端的班级id唯一性，将学期id加在班级id上,应该处理
+        dto.setClassId(dto.getClassId() - dto.getBaseSemesterId());
         IPage<ClassHonorsPageVo> page = classHonorsService.getPagePC(dto);
         PageOutput<ClassHonorsPageVo> pageOutput = ConventPage.getPageOutput(page, ClassHonorsPageVo.class);
         return RT.ok(pageOutput);

src/main/java/com/xjrsoft/module/student/controller/StudentHonorsController.java

@@ -50,7 +50,8 @@ public class StudentHonorsController {
     @ApiOperation(value="学生荣誉列表(分页)")
     @SaCheckPermission("studenthonors:detail")
     public RT<PageOutput<StudentHonorsPageVo>> page(@Valid StudentHonorsPageDto dto){
-
+        //传过来的班级id为加上学期id的，应该处理
+        dto.setClassId(dto.getClassId() - dto.getBaseSemesterId());
         Page<StudentHonorsPageVo> page = studentHonorsService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<StudentHonorsPageVo> pageOutput = ConventPage.getPageOutput(page, StudentHonorsPageVo.class);
         return RT.ok(pageOutput);
@@ -71,7 +72,8 @@ public class StudentHonorsController {
         });
         studentHonorsService.getClassInfo().forEach((node) -> {
             voList.add(new StudentHonorsTreeVo(){{
-                setId(node.getId());
+                //为保证返回给前端的班级id唯一性，将学期id加在班级id上
+                setId(node.getId()+node.getParentId());
                 setName(node.getName());
                 setParentId(node.getParentId());
             }});

src/main/java/com/xjrsoft/module/student/dto/StudentHonorsPageDto.java

@@ -25,4 +25,6 @@ public class StudentHonorsPageDto extends PageInput {
     @ApiModelProperty("班级id")
     public Long classId;
 
+    @ApiModelProperty("学期Id")
+    private Long baseSemesterId;
 }

src/main/java/com/xjrsoft/module/student/service/impl/ClassHonorsServiceImpl.java

@@ -85,7 +85,8 @@ public class ClassHonorsServiceImpl extends MPJBaseServiceImpl<ClassHonorsMapper
         //获取班级荣誉中出现的学期下的所有班级作为树的子级
         classHonorsMapper.getSemesterClass().forEach((node) -> {
             treeVoList.add(new ClassHonorsSemesterClassTreeVo(){{
-                setId(node.getClassId());
+                //为保证返回给前端的班级id唯一性，将学期id加在班级id上
+                setId(node.getClassId() + node.getBaseSemesterId());
                 setName(node.getClassIdCN());
                 setParentId(node.getBaseSemesterId());
             }});

src/main/resources/application-dev.yml

@@ -64,6 +64,7 @@ xjrsoft:
     druid-password: admin # druid 监控密码
     default-password: "cqtlzjzx2023" #默认密码（用户重置密码后为该密码）
     domain-api: http://10.150.10.139:8888/api #api域名地址
+    domain-app: http://10.150.10.139:8003/# #app域名地址
     domain-web: http://10.150.10.139:8888 #web域名地址
 #    domain-api: http://127.0.0.1:9000/api #api域名地址
 #    domain-web: http://127.0.0.1:9000 #web域名地址

src/main/resources/application-prod.yml

@@ -62,6 +62,7 @@ xjrsoft:
     druid-password: admin # druid 监控密码
     default-password: "cqtlzjzx2023" #默认密码（用户重置密码后为该密码）
     domain-api: https://zhxy.cqtlzjzx.com/api #api域名地址
+    domain-app: https://zhxy.cqtlzjzx.com/app/# #app域名地址
     domain-web: https://zhxy.cqtlzjzx.com #web域名地址
     white-list:
       - 192.168.0.139

src/main/resources/mapper/student/StudentHonorsMapper.xml

@@ -10,7 +10,7 @@
         LEFT JOIN xjr_dictionary_detail t3 ON t1.honors_level = t3.code AND t3.item_id = 1731576278748352514
         LEFT JOIN xjr_dictionary_detail t4 ON t1.honors_type = t4.code AND t4.item_id = 1731577666295418881
         LEFT JOIN xjr_dictionary_detail t5 ON t1.honors_grade = t5.code AND t5.item_id = 1731577201793028098
-        WHERE t1.delete_mark = 0 AND t1.class_id = #{dto.classId} and t1.status = 1
+        WHERE t1.delete_mark = 0 AND t1.class_id = #{dto.classId} AND t1.base_semester_id = #{dto.baseSemesterId} and t1.status = 1
     </select>
 
     <select id="getSemesterInfo" resultType="com.xjrsoft.module.student.vo.StudentHonorsListVo">