jzh 1 éve
szülő
commit
aabcc341d3

+ 1 - 1
zjugis-business/src/main/resources/templates/Staff/index.ftl

@@ -238,7 +238,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                         <tr>
 
                             <td class="th">
-                                <div class="form-label">:</div>
+                                <div class="form-label">参加工作时间:</div>
                             </td>
                             <td>
                                 <div class="form-group">

+ 4 - 4
zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -205,10 +205,10 @@ public class RecordsServiceImpl implements RecordsService {
 
         //新建员工账号以及其相关的关系 如果账号已经存在就开启账号的使用状态 以及修改其相关的权限和部门关系
         UserBaseDTO user = initUser(staffRecordSDO);
-//        CommonResult<String> result = userApi.createUser(user);
-//        if (result.getCode() != 0) {
-//            throw new RuntimeException(result.getMsg());
-//        }
+        CommonResult<String> result = userApi.createUser(user);
+        if (result.getCode() != 0) {
+            throw new RuntimeException(result.getMsg());
+        }
 
         //亲属列表更新
         updateFamilyDetail(staffRecordSDO.getId(), RecordsConvert.INSTANCE.convertDetailO1(dto.getFamilyList()));