From e6257d8f6603e48ef151f7625dd8fe2672cf94f2 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Thu, 15 Jan 2026 11:15:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E6=A0=91?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcloud/basic/info/command/UserUpdateExe.java     | 4 +++-
 .../zcloud/basic/info/command/query/DepartmentQueryExe.java   | 2 +-
 .../java/com/zcloud/basic/info/dto/DepartmentTreeQry.java     | 4 ++--
 .../info/persistence/repository/impl/UserRepositoryImpl.java  | 2 --
 .../src/main/resources/mapper/DepartmentMapper.xml            | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
index f9aa854a..d0e058fa 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
@@ -203,7 +203,9 @@ public class UserUpdateExe {
 
         // 根据手机号查询用户信息
         List<UserDO> listByPhone = userRepository.getListByPhone(cmd.getPhone(),null);
-
+        if(CollUtil.isEmpty(listByPhone)){
+            throw new BizException("手机号不存在");
+        }
         UserE userE = new UserE();
         userE.checkPassword(cmd.getNewPassword(), cmd.getConfirmPassword());
         //TODO 需要修改
diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
index 9024468e..f7364fc9 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java
@@ -191,7 +191,7 @@ public class DepartmentQueryExe {
         Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
         List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) parmas.get("enterpriseType"));
         if (CollUtil.isNotEmpty(enterpriseType)) {
-            parmas.put("corpinfoTypeList",enterpriseType);
+            parmas.put("inType",enterpriseType);
         }
         List<DepartmentDO> pageResponse = departmentRepository.listAllTreeByCorpType(parmas);
         if (CollUtil.isEmpty(pageResponse)) {
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java
index 530726f0..a0a2ade1 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java
@@ -31,8 +31,8 @@ public class DepartmentTreeQry {
     private Long eqCorpinfoId;
     @ApiModelProperty(value = "父id", name = "eqParentId")
     private Long eqParentId;
-    @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "corpinfoTypeList")
-    private List<Integer> corpinfoTypeList;
+    @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "inType")
+    private List<Integer> inType;
 
     @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType")
     private Integer enterpriseType;
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
index 68351ce3..dac21d6d 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
@@ -514,8 +514,6 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
                 }
             }
 
-        }else{
-            throw new BizException("请输入原密码");
         }
 
         //修改多个密码
diff --git a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
index 79678a34..3fb3e5fb 100644
--- a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml
@@ -18,9 +18,9 @@
         left join corp_info c on d.corpinfo_id = c.id
         where d.delete_enum = 'FALSE'
         and c.delete_enum = 'FALSE'
-        <if test="corpinfoTypeList != null and corpinfoTypeList.size() > 0">
+        <if test="inType != null and inType.size() > 0">
             and c.type in
-            <foreach collection="corpinfoTypeList" item="item" open="(" close=")" separator=",">
+            <foreach collection="inType" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>