问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -606,7 +606,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
              */
             String callInOrgSid = baseAccadjApply.getCallInOrgSid();
             SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInOrgSid).getData();
-            salOutStock.setFCustomerID(data.getOtherCode());
+            salOutStock.setFCustomerID(data.getOrgCode());
             //salOutStock.setFCustomerID(" JXYXB");
             /**
              * 销售部门:FSaleDeptID  (必填项)

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java

@@ -32,6 +32,8 @@ public class SysUserQuery implements Query {
     private String roleSid;
     @ApiModelProperty("用户名称")
     private String userName;
+    @ApiModelProperty("姓名")
+    private String name;
     @ApiModelProperty("部门名称")
     private String orgName;
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -123,6 +123,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (StringUtils.isNotBlank(query.getRoleSid())) {
             qw.eq("role.sid", query.getRoleSid());
         }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("staff.name", query.getName());
+        }
         return qw;
     }
 
@@ -215,7 +218,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (null == user) {
             return false;
         }
-        String mobile = user.getUserName();
+        String mobile = user.getMobile();
 
         String substring = mobile.substring(5, 11);
         // 1.生成新密码
@@ -895,8 +898,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
      * @param userSid 用户的sid
      * @return
      */
-    public SysUserInfoVo selectUserInfoByUserSid(String userSid,String orgSid) {
-        return baseMapper.selectUserInfoByUserSidOne(userSid,orgSid);
+    public SysUserInfoVo selectUserInfoByUserSid(String userSid, String orgSid) {
+        return baseMapper.selectUserInfoByUserSidOne(userSid, orgSid);
     }
 
     /**
@@ -977,7 +980,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (StringUtils.isBlank(query.getRoleSid())) {
             return rb.setMsg("角色sid不能为空");
         }
-        if(StringUtils.isBlank(query.getOrgPath())){
+        if (StringUtils.isBlank(query.getOrgPath())) {
             if (StringUtils.isBlank(query.getOrgSidPath())) {
                 return rb.setMsg("机构全路径不能为空");
             }
@@ -993,7 +996,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             } else {
                 return rb.setMsg("该角色层级未设置");
             }
-        }else{
+        } else {
             sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), query.getOrgPath());
         }
 
@@ -1119,7 +1122,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     }
 
     public List<SysStaffOrg> selectOrgBySid(String orgPath, String staffSid) {
-        return sysStaffOrgService.selectOrgBySid(orgPath,staffSid);
+        return sysStaffOrgService.selectOrgBySid(orgPath, staffSid);
     }
 
     public List<String> getPost(String userSid) {