移动端切换机构存放地点变更调式

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -343,6 +343,7 @@ public class FlowableRest implements FlowableFeign {
                         UserQuery userQuery = new UserQuery();
                         userQuery.setRoleSid(roleSid);
                         userQuery.setOrgSidPath(dto.getOrgSidPath());
+                        userQuery.setOrgPath(dto.getOrgPath());
                         List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
                         sysUserVoLists.addAll(sysUserVos);
                     }

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

@@ -180,6 +180,11 @@ public interface SysUserFeign {
     @GetMapping("/selectUserInfoByUserSid/{userSid}")
     public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(@PathVariable("userSid") String userSid);
 
+    @ApiOperation(value = "根据用户的sid查询用户的组织信息")
+    @ResponseBody
+    @GetMapping("/selectUserInfoByUserSid/{userSid}/{orgSid}")
+    public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgSid") String orgSid);
+
     @PostMapping("/setIsEnable/{sid}/{isEnable}")
     @ResponseBody
     @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用")

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

@@ -165,6 +165,11 @@ public class SysUserFeignFallback implements SysUserFeign {
 		return rb.setMsg("接口anrui_portal/sysuser/selectUserInfoByUserSid无法访问");
 	}
 
+	@Override
+	public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(String userSid, String orgSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean setIsEnable(String sid, String isEnable) {
 		return null;

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

@@ -127,6 +127,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return
      */
     SysUserInfoVo selectUserInfoByUserSid(String userSid);
+    SysUserInfoVo selectUserInfoByUserSidOne(@Param("userSid") String userSid,@Param("orgSid") String orgSid);
 
     /**
      * 根据员工sid更新用户的工号以及手机号

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

@@ -182,6 +182,17 @@
         ORDER BY sso.id
         LIMIT 1
     </select>
+
+    <select id="selectUserInfoByUserSidOne" resultType="com.yxt.anrui.portal.api.sysuser.SysUserInfoVo">
+        SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode
+        FROM sys_user su
+        LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
+        LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
+        LEFT JOIN sys_organization so ON sso.orgSid = so.sid
+        WHERE su.sid = #{userSid} and find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
+        ORDER BY sso.id
+        LIMIT 1
+    </select>
     <!--根据员工sid更新用户表的工号以及手机号-->
     <update id="updateByStaffSid">
         update sys_user

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

@@ -571,6 +571,16 @@ public class SysUserRest implements SysUserFeign {
         return rb.success().setData(sysUserInfoVo);
     }
 
+    @Override
+    public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(String userSid, String orgSid) {
+        ResultBean<SysUserInfoVo> rb = ResultBean.fireFail();
+        SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid,orgSid);
+        if (sysUserInfoVo == null) {
+            return rb.setData(new SysUserInfoVo()).setMsg("该用户未设置所属部门");
+        }
+        return rb.success().setData(sysUserInfoVo);
+    }
+
     @Override
     public ResultBean setIsEnable(String sid, String isEnable) {
         SysUser sysUser = sysUserService.fetchBySid(sid);

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

@@ -887,7 +887,16 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
      */
     public SysUserInfoVo selectUserInfoByUserSid(String userSid) {
         return baseMapper.selectUserInfoByUserSid(userSid);
+    }
 
+    /**
+     * 根据用户sid获取用户的组织信息
+     *
+     * @param userSid 用户的sid
+     * @return
+     */
+    public SysUserInfoVo selectUserInfoByUserSid(String userSid,String orgSid) {
+        return baseMapper.selectUserInfoByUserSidOne(userSid,orgSid);
     }
 
     /**
@@ -968,10 +977,10 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (StringUtils.isBlank(query.getRoleSid())) {
             return rb.setMsg("角色sid不能为空");
         }
-        if (StringUtils.isBlank(query.getOrgSidPath())) {
-            return rb.setMsg("机构全路径不能为空");
-        }
         if(StringUtils.isBlank(query.getOrgPath())){
+            if (StringUtils.isBlank(query.getOrgSidPath())) {
+                return rb.setMsg("机构全路径不能为空");
+            }
             //根据角色sid获取角色的层级
             String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid());
             if (StringUtils.isNotBlank(levelTypeKey)) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -405,7 +405,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                         //根据外采编号查询外采的申请人部门
                         String createBySid = applicationDetailsVo.getCreateBySid();
                         //查询该申请人的部门
-                        ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid);
+                        ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid,applicationDetailsVo.getUseOrgSid());
                         if (sysUserInfoVoResultBean.getSuccess()) {
                             SysUserInfoVo sysUserInfoVo = sysUserInfoVoResultBean.getData();
                             if (sysUserInfoVo != null) {