From a73226b6da5debe467f0f95d9ecc79b82bffc87c Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Fri, 2 Aug 2024 09:52:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93=E4=B8=8A=E7=99=BB=E6=9C=BA3?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E9=9B=B6=E7=A2=8E=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEnforcementRegistrationController.java         | 11 ++++++++---
 .../src/main/resources/mapper/system/DeptMapper.xml   |  4 ++--
 .../main/resources/mapper/system/DictDataMapper.xml   |  1 +
 .../zdxt/code/mapper/EnterpriseInformationMapper.java |  1 +
 .../code/service/IEnterpriseInformationService.java   |  1 +
 .../impl/EnterpriseInformationServiceImpl.java        |  9 +++++++++
 .../resources/mapper/EnterpriseInformationMapper.xml  |  5 +++++
 7 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
index 6ec6b0dd..b72a1baf 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
@@ -315,12 +315,17 @@ public class AppEnforcementRegistrationController extends BaseController
 //        registration.setParams(params);
 //        return ZDResponse.success("查询成功", registration);
 //    }
-    @GetMapping( "/getByUserIdAndEnterpriseNumber/{userId}/{enterpriseNumber}")
+    @GetMapping( "/getByUserIdAndEnterpriseNumber/{modth}/{userId}/{enterpriseNumber}")
     @ResponseBody
-    public ZDResponse getByUserIdAndEnterpriseNumber(@PathVariable Long userId, @PathVariable String enterpriseNumber)
+    public ZDResponse getByUserIdAndEnterpriseNumber(@PathVariable String modth, @PathVariable Long userId, @PathVariable String enterpriseNumber)
     {
         // 拿到的企业编码是加密盐的, 和登记表对不上
-        EnterpriseInformation enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationBySalt(enterpriseNumber);
+        EnterpriseInformation enterpriseInformation = null;
+        if ("add".equals(modth)) {
+            enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationBySalt(enterpriseNumber);
+        } else {
+            enterpriseInformation = iEnterpriseInformationService.selectEnterpriseInformationByNum(enterpriseNumber);
+        }
         // 前端似乎没保存部门id, 所以弄个userId上来 通过userId获取其部门id
         UserBean userBean = userApi.getUserByUserId(userId);
         EnforcementRegistration registration = enforcementRegistrationService.getByDeptIdAndEnterpriseNumber(userBean.getDeptId(), enterpriseInformation.getEnterpriseNumber());
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
index 15d16ad5..958d0791 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml
@@ -126,10 +126,10 @@
     <select id="selectDeptList" parameterType="Dept" resultMap="DeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
-        <if test="parentId != null and parentId != '' and parentId == '0'">
+        <if test='parentId != null and parentId != "" and parentId == "0"'>
             AND parent_id = #{parentId} or parent_id is null
         </if>
-        <if test="parentId != null and parentId != '' and parentId != '0'">
+        <if test='parentId != null and parentId != "" and parentId != "0"'>
             AND parent_id = #{parentId}
         </if>
         <if test="deptName != null and deptName != ''">
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml
index f4363577..f0abff25 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DictDataMapper.xml
@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND status = #{status}
 			</if>
 		</where>
+		order by dict_sort asc
 	</select>
 	
 	<select id="selectDictDataByType" parameterType="DictData" resultMap="DictDataResult">
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java
index 0df187ce..5999c89a 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java
@@ -18,6 +18,7 @@ public interface EnterpriseInformationMapper
      * @return 企业信息登记
      */
     public EnterpriseInformation selectEnterpriseInformationById(String id);
+    public EnterpriseInformation selectEnterpriseInformationByNum(String num);
 
     /**
      * 查询企业信息
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
index 6f6c4548..41919054 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
@@ -18,6 +18,7 @@ public interface IEnterpriseInformationService
      * @return 企业信息登记
      */
     public EnterpriseInformation selectEnterpriseInformationById(String id);
+    public EnterpriseInformation selectEnterpriseInformationByNum(String num);
 
     /**
      * 查询企业信息
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
index dd884ec6..44c45e9f 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
@@ -86,6 +86,15 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
         enterpriseInformation.setQrCodeGenerateHistory(qrCodeGenerateHistory);
         return enterpriseInformation;
     }
+    @Override
+    public EnterpriseInformation selectEnterpriseInformationByNum(String num)
+    {
+        EnterpriseInformation enterpriseInformation = enterpriseInformationMapper.selectEnterpriseInformationByNum(num);
+        QrCodeGenerateHistory qrCodeGenerateHistory =
+                iQrCodeGenerateHistoryService.selectQrCodeGenerateHistoryByNewest(enterpriseInformation.getEnterpriseNumber());
+        enterpriseInformation.setQrCodeGenerateHistory(qrCodeGenerateHistory);
+        return enterpriseInformation;
+    }
 
     @Override
     public EnterpriseInformation selectEnterpriseInformationBySalt(String salt) {
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
index 598b9643..7ad6cc2d 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml
@@ -66,6 +66,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectEnterpriseInformationByNum" parameterType="String" resultMap="EnterpriseInformationResult">
+        <include refid="selectEnterpriseInformationVo"/>
+        where enterprise_number = #{num}
+    </select>
+
     <select id="selectEnterpriseInformationBySalt" parameterType="String" resultMap="EnterpriseInformationResult">
         <include refid="selectEnterpriseInformationVo"/>
         where salt = #{salt}