Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java

@@ -130,10 +130,10 @@ public class SysStaffinfoRest{
     }
 
     @ApiOperation("员工信息编辑初始化及详情")
-    @GetMapping("/fetchBySid/{sid}")
+    @GetMapping("/fetchBySid/{sid}/{orgSid}")
-    public ResultBean<SysStaffinfoDetailsVo> fetchBySid(@PathVariable("sid") String sid) {
+    public ResultBean<SysStaffinfoDetailsVo> fetchBySid(@PathVariable("sid") String sid,@PathVariable("orgSid") String orgSid) {
         ResultBean rb = ResultBean.fireFail();
-        SysStaffinfoDetailsVo sysStaffinfo = sysStaffinfoService.selectDetailsBySid(sid);
+        SysStaffinfoDetailsVo sysStaffinfo = sysStaffinfoService.selectDetailsBySid(sid,orgSid);
         if (sysStaffinfo == null) {
             return rb.setData(new SysStaffinfoDetailsVo());
         }

src/main/java/com/yxt/portal/apiadmin/SysUserRoleRest.java

@@ -69,7 +69,7 @@ public class SysUserRoleRest {
 	@PostMapping("/update")
 	public ResultBean update(@RequestBody SysUserRoleDto dto){
 		ResultBean rb = ResultBean.fireFail();
-		sysUserRoleService.deleteByUserSid(dto.getUserSid(),"");
+		sysUserRoleService.deleteByUserSid(dto.getUserSid(),dto.getOrgSid());
 		String roleSid = dto.getRoleSid();
 		if(StringUtils.isBlank(roleSid)){
 			return rb.success();

src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml

@@ -37,9 +37,9 @@
         SELECT role.name, role.sid, ISNULL(userRole.sid) AS checked
         FROM sys_role role
                  LEFT JOIN sys_user_role userRole ON role.sid = userRole.`roleSid`
-            AND userRole.userSid = #{userSid}  and role.isEnable="1" and role.isDelete !="1"
+            AND userRole.userSid = #{userSid}
         where
-            role.orgSid=#{orgSid}
+            role.orgSid=#{orgSid}  and role.isEnable="1" and role.isDelete !="1"
     </select>
 
     <select id="fetchByUserSid" resultType="com.yxt.portal.biz.sysrole.SysRoleVo">

src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java

@@ -73,7 +73,6 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
         if (StringUtils.isNotBlank(query.getOrgSid())) {
             qw.eq("sr.orgSid", query.getOrgSid());
         }
-        qw.eq("sr.isEnable","1");
         qw.ne("sr.isDelete","1");
         return qw;
     }
@@ -89,6 +88,7 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
 
     public List<SysRoleVo> listAllVo(SysRoleQuery query) {
         QueryWrapper<SysRole> qw = createQueryWrapper(query);
+                qw.eq("sr.isEnable","1");
         return baseMapper.selectListAllVo(qw);
     }
 

src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -828,7 +828,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
      * @param sid 员工sid
      * @return
      */
-    public SysStaffinfoDetailsVo selectDetailsBySid(String sid) {
+    public SysStaffinfoDetailsVo selectDetailsBySid(String sid,String orgSid1) {
         String path = fileUploadComponent.getUrlPrefix();
         SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("sid",sid));
         SysStaffinfoDetailsVo sysStaffinfoDetailsVo = baseMapper.selectDetailsBySid(sysUser.getStaffSid(), path);
@@ -838,7 +838,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         sysStaffinfoDetailsVo.setUserType(sysUser.getUserType().toString());
         sysStaffinfoDetailsVo.setRemarks(sysUser.getRemarks());
         if (sysStaffinfoDetailsVo != null) {
-            List<SysStaffOrg> sysStaffOrgList = sysStaffOrgService.getOrgByStaffSidList(sysUser.getStaffSid());
+            List<SysStaffOrg> sysStaffOrgList = sysStaffOrgService.getOrgByStaffSidList(sysUser.getStaffSid(),orgSid1);
             String orgSid = "";
             String type = "";
             for (SysStaffOrg s : sysStaffOrgList) {

src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java

@@ -93,8 +93,7 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     SysStaffOrg getOrgByStaffSidAndPath(@Param("sid") String sid, @Param("path") String path);
     @Select("select * from sys_staff_org where staffSid=#{sid} and orgSid=#{orgSid}")
     SysStaffOrg getOrgByStaffSidn(@Param("sid") String sid,@Param("orgSid") String orgSid);
-    @Select("select * from sys_staff_org where staffSid=#{sid}")
+    List<SysStaffOrg> getOrgByStaffSidList(@Param("sid")String sid,@Param("orgSid")String orgSid);
-    List<SysStaffOrg> getOrgByStaffSidList(String sid);
 
     @Delete("delete from sys_staff_org where orgSid=#{sid} and (manageType = 1 or manageType = 2)")
     void delZGAndFGByOrgSid(String sid);

src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml

@@ -80,6 +80,12 @@
            AND manageType != 2
     </select>
 
+    <select id="getOrgByStaffSidList" resultType="int">
+        select * from sys_staff_org where staffSid=#{sid}
+        <if test="orgSid!=null and orgSid!=''">
+            and orgSid=#{orgSid}
+        </if>
+    </select>
     <select id="selectByStaffAndOrg" resultType="int">
         select count(*)
         from sys_staff_org sso

src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java

@@ -233,8 +233,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         return baseMapper.getOrgByStaffSidn(sid,orgSid);
     }
 
-    public List<SysStaffOrg> getOrgByStaffSidList(String sid) {
+    public List<SysStaffOrg> getOrgByStaffSidList(String sid,String orgSid) {
-        return baseMapper.getOrgByStaffSidList(sid);
+        return baseMapper.getOrgByStaffSidList(sid,orgSid);
     }
 
     /**

src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml

@@ -31,7 +31,11 @@
 	</select>
 
 	<delete id="deleteByUserSid">
-		delete from sys_user_role where userSid=#{userSid} and orgSid=#{orgSid}
+		delete from sys_user_role where userSid=#{userSid}
+		<if test="orgSid!=null and orgSid!=''">
+			and orgSid=#{orgSid}
+		</if>
+
 	</delete>
 	<select id="getUserIdListByRoleSid" resultType="String">
 		SELECT su.id