diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java index ad85798c..000d70d4 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/UserApiImpl.java @@ -65,7 +65,8 @@ public class UserApiImpl implements UserApi { DeptBean deptBean = new DeptBean(); //属性赋值 - BeanUtil.copyProperties(sysUser.getDept(),deptBean); +// BeanUtil.copyProperties(sysUser.getDept(),deptBean); + BeanUtil.copyProperties(dept,deptBean); if (BeanUtil.isNotEmpty(dept)){ deptIdArr = dept.getAncestors()!=null?dept.getAncestors().split(","):new String[]{}; if("0".equals(dept.getDeptType())){ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index a8ce8f20..3cb523d1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -73,6 +73,7 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc { enterpriseLawEnforcement.setCreateTime(DateUtils.getNowDate()); enterpriseLawEnforcement.setId(IdUtil.simpleUUID()); + enterpriseLawEnforcement.setLawEnforcementCode(IdUtil.simpleUUID()); UserBean user = userApi.getCurrentUser(); enterpriseLawEnforcement.setUserId(user.getUserId()); enterpriseLawEnforcement.setDeptId(user.getDeptId());