From 95c6e6c380429b1db786f1915c1a934fea0f695e Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Wed, 27 Mar 2024 14:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=87=AA=E5=8A=A8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=90=8C=E6=84=8F=E7=BC=96=E7=A0=81,=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=8E=B7=E5=8F=96=E9=83=A8=E9=97=A8=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/zdxt/auth/feign/UserApiImpl.java         | 3 ++-
 .../code/service/impl/EnterpriseLawEnforcementServiceImpl.java | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

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());