Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/databoard/controller/DataboardController.java

@@ -289,15 +289,15 @@ public class DataboardController {
         result.setTeacherFemaleCount(teacherFemaleSet.size());
 
         Set<String> teacherSet1 = teacherList.stream()
-                .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1601")))
+                .filter(x -> (x.getEmployType() != null && x.getEmployType().equals("FB1601")))
                 .map(XjrUserPageVo::getId).collect(Collectors.toSet());
         result.setTeacherCount1(teacherSet1.size());
         Set<String> teacherSet2 = teacherList.stream()
-                .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1605")))
+                .filter(x -> (x.getEmployType() != null && x.getEmployType().equals("FB1605")))
                 .map(XjrUserPageVo::getId).collect(Collectors.toSet());
         result.setTeacherCount2(teacherSet2.size());
         Set<String> teacherSet4 = teacherList.stream()
-                .filter(x -> (x.getEmployWay() != null && x.getEmployWay().equals("FB1609")))
+                .filter(x -> (x.getEmployType() != null && x.getEmployType().equals("FB1609")))
                 .map(XjrUserPageVo::getId).collect(Collectors.toSet());
         result.setTeacherCount4(teacherSet4.size());
         return RT.ok(result);

src/main/java/com/xjrsoft/module/job/ClassGraduateTask.java

@@ -1,12 +1,14 @@
 package com.xjrsoft.module.job;
 
 import com.xjrsoft.module.base.service.IBaseClassService;
+import com.xjrsoft.module.base.service.IBaseGradeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**
+ * 自动别业班级
  * @author dzx
  * @date 2025/1/14
  */
@@ -17,11 +19,17 @@ public class ClassGraduateTask {
     @Autowired
     private IBaseClassService classService;
 
+    @Autowired
+    private IBaseGradeService gradeService;
+
     @Scheduled(cron = "0 */15 23 30 6 ?")
     public void execute() {
         doExecute();
     }
 
+    /**
+     * 根据年级自动毕业班级和学生
+     */
     public void doExecute() {
 
     }

src/main/java/com/xjrsoft/module/organization/service/impl/UserServiceImpl.java

@@ -359,10 +359,12 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
 //    public boolean unbindOpenid(Long id) {
     public boolean unbindOpenid(UnbindOpenidDto dto) {
         // 验证手机验证码
-        boolean verifyResult = smsCtcc.captchaVerify(dto.getMobile(), dto.getCode());
+        if(StrUtil.isNotEmpty(dto.getMobile())){
+            boolean verifyResult = smsCtcc.captchaVerify(dto.getMobile(), dto.getCode());
 
-        if(!verifyResult){
-            throw new MyException("验证码错误");
+            if(!verifyResult){
+                throw new MyException("验证码错误");
+            }
         }
 
         User updateUser = new User();

src/main/java/com/xjrsoft/module/room/service/impl/WfRoomApplicantServiceImpl.java

@@ -21,7 +21,9 @@ import com.xjrsoft.module.room.mapper.WfRoomApplicantMapper;
 import com.xjrsoft.module.room.service.IWfRoomApplicantService;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
+import com.xjrsoft.module.workflow.entity.WorkflowFormRelation;
 import lombok.AllArgsConstructor;
+import org.camunda.bpm.engine.history.HistoricProcessInstance;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -84,10 +86,13 @@ public class WfRoomApplicantServiceImpl extends MPJBaseServiceImpl<WfRoomApplica
         WfRoomApplicant applicant = this.getById(id);
         List<User> list = userService.list(
                 new MPJLambdaWrapper<User>()
+                        .distinct()
                         .select(User::getId)
                         .select(User.class, x -> VoToColumnUtil.fieldsToColumns(User.class).contains(x.getProperty()))
                         .innerJoin(UserStudent.class, UserStudent::getUserId, User::getId)
+                        .innerJoin(WorkflowFormRelation.class, WorkflowFormRelation::getFormKeyValue, UserStudent::getId)
                         .eq(UserStudent::getStudentId, applicant.getApplicantUserId())
+                        .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_COMPLETED)
                         .isNotNull(User::getOpenId)
         );
         SimpleDateFormat sdf = new SimpleDateFormat("yyy年MM月dd日");