diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
index 12c66500f2..3642ca921e 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
@@ -100,7 +100,7 @@ public interface SysStaffinfoFeign {
      * @param staffName 员工姓名
      * @return
      */
-    @ApiOperation("获取集团内全部员工姓名")
+    @ApiOperation("获取部门内全部员工姓名")
     @GetMapping("/getStaffNameByDeptSid")
     public ResultBean<List<Map<String,String>>> getStaffNameByDeptSid(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid);
 
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
index 57bd0b375d..9fce935e40 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
@@ -103,6 +103,7 @@
         SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
         FROM sys_organization so
         WHERE isDept = 0
+        ORDER BY psid
     </select>
 
     <select id="selectOrgCodeByPsid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganization">
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
index 8ab39112cf..3fe9a7e76b 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
@@ -145,25 +145,33 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         SysOrganization entity = sysOrganizationService.fetchBySid(sid);
         List<SysStaffOrgVo> list = sysStaffOrgService.fetchByOrgSid(sid);
         String fgNames = "";
+        String fgSids = "";
         String zgNames = "";
+        String zgSids = "";
         for (SysStaffOrgVo s : list) {
             if ("1".equals(s.getManageType())) {
                 zgNames = zgNames + "," + s.getStaffName();
+                zgSids = zgSids + "," + s.getStaffSid();
             }
             if ("2".equals(s.getManageType())) {
                 fgNames = fgNames + "," + s.getStaffName();
+                fgSids = fgSids + "," + s.getStaffSid();
             }
         }
         if (fgNames.length() > 1) {
             fgNames = fgNames.substring(1, fgNames.length());
+            fgSids = fgSids.substring(1,fgSids.length());
         }
         if (zgNames.length() > 1) {
             zgNames = zgNames.substring(1, zgNames.length());
+            zgSids = zgSids.substring(1,zgSids.length());
         }
         SysOrganizationVo vo = new SysOrganizationVo();
         BeanUtil.copyProperties(entity, vo);
         vo.setFgNames(fgNames);
+        vo.setFgSids(fgSids);
         vo.setZgNames(zgNames);
+        vo.setZgSids(zgSids);
         return rb.success().setData(vo);
     }
 
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
index 978057c1e9..250575f7b5 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
@@ -308,6 +308,13 @@
     </select>
 
     <select id="getStaffNameByDeptSid" resultType="java.util.Map">
-
+        SELECT DISTINCT
+                ss.sid,
+                ss.name
+        FROM
+                sys_staffinfo ss
+                        LEFT JOIN sys_staff_org sso
+                        ON ss.`sid` = sso.`staffSid`
+                ${ew.customSqlSegment}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
index 5e1f862597..dbc29dba08 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
@@ -195,9 +195,9 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         //判断身份证号出生日期和填写的出生日期是否相同
         String idNo = dto.getIdNo();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyddMM");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
         String birthday = simpleDateFormat.format(dto.getBirthday());
-        String substring = idNo.substring(6, 15);
+        String substring = idNo.substring(6, 14);
         if (!birthday.equals(substring)){
             return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
         }
@@ -360,8 +360,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         //查询员工的手机号是否重复
         SysStaffinfo sysStaffinfo2 = baseMapper.selectByMobileAndSid(dto.getMobile(), sid);
-        SysUser sysUser = sysUserService.selectByMobile(dto.getMobile());
-        if (sysStaffinfo2 != null || sysUser != null) {
+        if (sysStaffinfo2 != null) {
             return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
         }
         //查询是否存在该身份证号的员工
@@ -536,10 +535,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
     public List<Map<String, String>> getStaffNameByDeptSid(String staffName, String deptSid) {
         QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(staffName)) {
-            qw.like("name", staffName);
+            qw.like("ss.name", staffName);
         }
-        //qw.eq("")
-        qw.eq("isDelete",0);
+        qw.eq("sso.orgSid",deptSid);
+        qw.eq("ss.isDelete",0);
         return baseMapper.getStaffNameByDeptSid(qw);
     }
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
index 21026a3f92..6991e1f36d 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
@@ -42,7 +42,7 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     @Delete("delete from sys_staff_org where orgSid=#{orgSid} ")
     void delByOrgSid(@Param("orgSid") String sid);
 
-    @Select("select staffOrg.manageType as manageType,staffOrg.orgSid as orgSid,staffinfo.name as staffName " +
+    @Select("select staffOrg.manageType as manageType,staffOrg.orgSid as orgSid,staffinfo.name as staffName,staffinfo.sid as staffSid " +
             "from sys_staff_org staffOrg left join sys_staffinfo staffinfo on staffinfo.sid=staffOrg.staffSid " +
             "where staffOrg.orgSid=#{orgSid} ")
     List<SysStaffOrgVo> fetchByOrgSid(@Param("orgSid") String orgSid);
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java
index b601a994ba..4e311f32c6 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java
@@ -30,6 +30,7 @@ import com.yxt.common.core.query.Query;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * Project: anrui-scm(进销存) <br/>
@@ -45,12 +46,9 @@ import io.swagger.annotations.ApiModelProperty;
  * @since 1.0
  */
 @ApiModel(value = "仓库 查询条件", description = "仓库 查询条件")
+@Data
 public class ScmWarehouseQuery implements Query {
 
-    
-	@ApiModelProperty("使用组织")
-    private String useOrg; // 使用组织
-    
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
     
@@ -63,125 +61,9 @@ public class ScmWarehouseQuery implements Query {
 	@ApiModelProperty("详细地址")
     private String warehouseAttribute; // 详细地址
     
-	@ApiModelProperty("仓库负责人")
-    private String warehouseContract; // 仓库负责人
-    
-	@ApiModelProperty("仓库负责人sid")
-    private String warehouseContractSid; // 仓库负责人sid
+	@ApiModelProperty("负责人及电话")
+    private String warehouseContract; // 负责人及电话
     
 	@ApiModelProperty("分组")
     private String warehouseGroup; // 分组
-
-	
-	/**
-	 * @return 使用组织
-	 */
-	public String getUseOrg(){
-		return useOrg;
-	}
-	
-	/**
-	 * @param useOrg 使用组织 to set
-	 */
-	public void setUseOrg(String useOrg){
-		this.useOrg = useOrg;
-	}
-	
-	/**
-	 * @return 使用组织sid
-	 */
-	public String getUseOrgSid(){
-		return useOrgSid;
-	}
-	
-	/**
-	 * @param useOrgSid 使用组织sid to set
-	 */
-	public void setUseOrgSid(String useOrgSid){
-		this.useOrgSid = useOrgSid;
-	}
-	
-	/**
-	 * @return 编码
-	 */
-	public String getWarehouseCode(){
-		return warehouseCode;
-	}
-	
-	/**
-	 * @param warehouseCode 编码 to set
-	 */
-	public void setWarehouseCode(String warehouseCode){
-		this.warehouseCode = warehouseCode;
-	}
-	
-	/**
-	 * @return 名称
-	 */
-	public String getWarehouseName(){
-		return warehouseName;
-	}
-	
-	/**
-	 * @param warehouseName 名称 to set
-	 */
-	public void setWarehouseName(String warehouseName){
-		this.warehouseName = warehouseName;
-	}
-	
-	/**
-	 * @return 仓库属性
-	 */
-	public String getWarehouseAttribute(){
-		return warehouseAttribute;
-	}
-	
-	/**
-	 * @param warehouseAttribute 仓库属性 to set
-	 */
-	public void setWarehouseAttribute(String warehouseAttribute){
-		this.warehouseAttribute = warehouseAttribute;
-	}
-	
-	/**
-	 * @return 仓库负责人
-	 */
-	public String getWarehouseContract(){
-		return warehouseContract;
-	}
-	
-	/**
-	 * @param warehouseContract 仓库负责人 to set
-	 */
-	public void setWarehouseContract(String warehouseContract){
-		this.warehouseContract = warehouseContract;
-	}
-	
-	/**
-	 * @return 仓库负责人sid
-	 */
-	public String getWarehouseContractSid(){
-		return warehouseContractSid;
-	}
-	
-	/**
-	 * @param warehouseContractSid 仓库负责人sid to set
-	 */
-	public void setWarehouseContractSid(String warehouseContractSid){
-		this.warehouseContractSid = warehouseContractSid;
-	}
-	
-	/**
-	 * @return 分组
-	 */
-	public String getWarehouseGroup(){
-		return warehouseGroup;
-	}
-	
-	/**
-	 * @param warehouseGroup 分组 to set
-	 */
-	public void setWarehouseGroup(String warehouseGroup){
-		this.warehouseGroup = warehouseGroup;
-	}
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
index a8dc0fbc85..80454d27d4 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
@@ -57,11 +57,6 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
 		QueryWrapper<ScmWarehouse> qw = new QueryWrapper<>();
 
-
-		if (StringUtils.isNotBlank(query.getUseOrg())) {
-			qw.eq("useOrg", query.getUseOrg());
-		}
-
 		if (StringUtils.isNotBlank(query.getUseOrgSid())) {
 			qw.eq("useOrgSid", query.getUseOrgSid());
 		}
@@ -79,11 +74,7 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
 		}
 
 		if (StringUtils.isNotBlank(query.getWarehouseContract())) {
-			qw.eq("warehouseContract", query.getWarehouseContract());
-		}
-
-		if (StringUtils.isNotBlank(query.getWarehouseContractSid())) {
-			qw.eq("warehouseContractSid", query.getWarehouseContractSid());
+			qw.like("warehouseContract", query.getWarehouseContract());
 		}
 
 		if (StringUtils.isNotBlank(query.getWarehouseGroup())) {