验货入库

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

@@ -1,9 +1,15 @@
 package com.yxt.portal.apiadmin;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.portal.biz.sysorganization.SysOrganizationService;
+import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService;
+import com.yxt.portal.biz.sysstafforg.SysStaffOrgService;
+import com.yxt.portal.biz.sysuser.SysUser;
+import com.yxt.portal.biz.sysuser.SysUserService;
 import com.yxt.portal.biz.sysuserrole.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +38,12 @@ public class SysUserRoleRest {
 
 	@Autowired
 	private SysUserRoleService sysUserRoleService;
+	@Autowired
+	private SysOrganizationService sysOrganizationService;
+	@Autowired
+	SysStaffOrgService sysStaffOrgService;
+	@Autowired
+	SysUserService sysUserService;
 
 	@ApiOperation("根据条件分页查询数据的列表")
 	@PostMapping("/listPage")
@@ -79,6 +91,7 @@ public class SysUserRoleRest {
 			SysUserRole sysUserRole=new SysUserRole();
 			sysUserRole.setRoleSid(sid);
 			sysUserRole.setUserSid(dto.getUserSid());
+			sysUserRole.setOrgSid(dto.getOrgSid());
 			sysUserRoleService.saveOrUpdate(sysUserRole);
 		}
 		return rb.success();

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

@@ -1013,7 +1013,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         qw.eq("sso.orgSid", deptSid);
         qw.eq("s.isDelete", 0);
         qw.eq("sso.manageType","3");
-        return baseMapper.getStaffNameByDeptSid(qw);
+        List<Map<String, String>> maps =baseMapper.getStaffNameByDeptSid(qw).stream().filter(s->!s.get("name").equals("单位管理员")).collect(toList());
+        return maps;
     }
 
     public PagerVo<AppSysStaffVo> getUserList(PagerQuery<AppSysStaffQuery> pagerQuery) {

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

@@ -708,9 +708,11 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     public void delBySid(String sid) {
         SysUser sysUser=baseMapper.selectOne(new QueryWrapper<SysUser>().eq("sid",sid));
         SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("managerSid",sysUser.getStaffSid()));
-        sysOrganization.setManagerSid("");
-        sysOrganization.setManagerName("");
-        sysOrganizationService.updateById(sysOrganization);
+        if(null!=sysOrganization){
+            sysOrganization.setManagerSid("");
+            sysOrganization.setManagerName("");
+            sysOrganizationService.updateById(sysOrganization);
+        }
         sysUser.setIsDelete(1);
         baseMapper.update(sysUser,new QueryWrapper<SysUser>().eq("sid",sid));
     }