submit

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1766,11 +1766,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
             //跟新用户资料
             user.setRealname(item.getUserName());
-            user.setTelphone(EncryptHandler.encrypt(item.getUserPhone()));
-            user.setSex(StringUtils.isNotBlank(item.getSex()) && item.getSex().equals("男") ? 1:2);
+            if (ObjectUtils.isNotNull(item.getUserPhone())){
+                user.setTelphone(EncryptHandler.encrypt(item.getUserPhone()));
+            }
+            if (ObjectUtils.isNotNull(item.getSex())){
+                user.setSex(StringUtils.isNotBlank(item.getSex()) && item.getSex().equals("男") ? 1:2);
+            }
             user.setEduLevel(item.getEducation());
             user.setSchool(item.getSchool());
-            user.setGraduationTime(DateUtils.formatDate(item.getGraduationTime(),"yyyy-MM-dd"));
+            if (ObjectUtils.isNotNull(item.getGraduationTime())){
+                user.setGraduationTime(DateUtils.formatDate(item.getGraduationTime(),"yyyy-MM-dd"));
+            }
             user.setMajor(item.getMajor());
             user.setWorkYear(item.getWorkYear());
             user.setCompanyName(item.getCompany());
@@ -1808,7 +1814,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 User user = getOne(new LambdaQueryWrapper<User>()
                         .eq(User::getIdCard, EncryptHandler.encrypt(idCard)));
                 if (ObjectUtils.isNull(user)){
-                    return;
+                    throw new CustomException("文件名称有误，请按命名规则修改文件名！");
                 }
 
                 //上传OSS

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -697,6 +697,8 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             if (ObjectUtils.isNotNull(sysTenant) && sysTenant.getPeriodSign() == 1){
                 hasSeven = true;
                 studyRec.setCourseType(17);
+            }else if (!"继续教育二级造价师".equals(fullName)){
+                return true;
             }
         }
         UserVo userVo = iUserService.queryById(bo.getUserId());