he2802 1 rok pred
rodič
commit
974d178d22

+ 10 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserCertificateServiceImpl.java

@@ -134,10 +134,18 @@ public class UserCertificateServiceImpl extends ServiceImpl<UserCertificateMappe
             userCertificateVo.setMajorType("施工现场专业人员继续教育");
         }
         else if(userCertificateVo.getKeyValue().equals("certificate11")){
-            userCertificateVo.setMajorType("二级注册造价师");
+            if(Validator.isNotEmpty(userCertificateVo.getMajor())&&userCertificateVo.getMajor().equals("必修")){
+                userCertificateVo.setMajorType("二级注册造价师(必修)");
+            }else{
+                userCertificateVo.setMajorType("二级注册造价师(选修)");
+            }
         }
         else if(userCertificateVo.getKeyValue().equals("certificate12")){
-            userCertificateVo.setMajorType("二级注册建造师");
+            if(Validator.isNotEmpty(userCertificateVo.getMajor())&&userCertificateVo.getMajor().equals("必修")){
+                userCertificateVo.setMajorType("二级注册建造师(必修)");
+            }else{
+                userCertificateVo.setMajorType("二级注册建造师(选修)");
+            }
         }
         return userCertificateVo;
     }