移动端变更分管人员清token以及已认款的厂家采购不允许作废

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java

@@ -45,4 +45,6 @@ public interface BusVehicleApplyMapper extends BaseMapper<BusVehicleApply> {
     int abandonApply(@Param("sidsList") List<String> sidsList);
 
     int selectByNodeState(String join);
+
+    int selectCountBySids(String join);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml

@@ -94,4 +94,11 @@
         where nodeState <> '已办结'
           and find_in_set(sid, #{join})
     </select>
+
+    <select id="selectCountBySids" resultType="int">
+        select count(*)
+        from bus_vehicle_apply ba
+                 left join base_manufactor_subscription bs on ba.applicationCode = bs.proSchAppNo
+        where bs.state = 1 and find_in_set(sid, #{join})
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -831,7 +831,12 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         //查询该sid中是否有流程不是已办结的
         int count = baseMapper.selectByNodeState(StringUtils.join(sids, ","));
         if (count > 0) {
-            return rb.setMsg("作废的数据中包含流程未完结的数据，不允许作废");
+            return rb.setMsg("选择作废的数据中包含流程未完结的数据，不允许作废");
+        }
+        //查询需要作废的数据中是否包含已认款的
+        int counts = baseMapper.selectCountBySids(StringUtils.join(sids, ","));
+        if(counts>0){
+            return rb.setMsg("选择作废的数据中包含已认款的数据，不允许作废");
         }
         List<String> sidsList = Arrays.asList(sids);
         int i = baseMapper.abandonApply(sidsList);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -5,6 +5,8 @@ import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
+import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.QRCodeUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -19,10 +21,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.File;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
+
-import java.util.List;
+import static java.util.stream.Collectors.toList;
-import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -50,6 +51,10 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     private SysStaffinfoService sysStaffinfoService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private SysUserService sysUserService;
+    @Autowired
+    private RedisUtil redisUtil;
 
     @Override
     public ResultBean<PagerVo<SysOrganizationVo>> listPage(@RequestBody PagerQuery<SysOrganizationQuery> pq) {
@@ -98,6 +103,8 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     @Transactional(rollbackFor = Exception.class)
     public ResultBean update(SysOrganizationDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
+        //查询该机构下的所有分管人员
+        List<String> stringList = sysStaffOrgService.selectByOrgSid(sid);
         //根据组织sid查询组织信息
         SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
         if (sysOrganization == null) {
@@ -131,6 +138,42 @@ public class SysOrganizationRest implements SysOrganizationFeign {
             }
         }
         sysOrganizationService.updateBySid(dto.toMap(), sid);
+        //==========================添加清空变化的用户的token
+        //查询分管人员
+        List<String> stringList1 = new ArrayList<>();
+        List<String> reduce1 = new ArrayList<>();
+        if(StringUtils.isNotBlank(fgStaffSid)){
+            stringList1 = Arrays.asList(fgStaffSid.split(","));
+            reduce1 = stringList1.stream().filter(item -> !stringList.contains(item)).collect(toList());
+        }else{
+            reduce1 = stringList;
+        }
+        String orgSid1 = sysStaffOrgService.getOrgByOrgSid(sid);
+        if(reduce1.size()>0){
+            for (String s : reduce1){
+                //查询该人员的组织机构list
+                List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(s);
+                List<String> orgList = new ArrayList<>();
+                if (sysStaffOrgVos.size() > 0) {
+                    for (SysStaffOrgVo vv : sysStaffOrgVos) {
+                        String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+                        SysOrganization ss = sysOrganizationService.fetchBySid(orgSid);
+                        if (ss != null) {
+                            orgList.add(orgSid);
+                        } else {
+                            continue;
+                        }
+                    }
+                }
+                if(!orgList.contains(orgSid1)){
+                    //根据staffSid查询token
+                    String token = sysUserService.selectByStaffsid(s).getToken();
+                    //清空该token
+                    redisUtil.remove(token);
+                }
+            }
+
+        }
         return rb.success();
     }
 

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -14,6 +14,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -27,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
+import static java.util.stream.Collectors.toList;
+
 /**
  * Project: anrui_portal(门户建设) <br/>
  * File: SysOrganizationService.java <br/>
@@ -52,6 +55,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     private BaseVehicleBrandFeign baseVehicleBrandFeign;
     @Autowired
     private SysStaffinfoService sysStaffInfoService;
+    @Autowired
+    private RedisUtil redisUtil;
 
     public PagerVo<SysOrganization> listPage(PagerQuery<SysOrganizationQuery> pq) {
         SysOrganizationQuery query = pq.getParams();
@@ -163,14 +168,28 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
             if ("1".equals(manageType)) {
                 //查询是否有员工信息，如果有的话，删除关联关系
                 sysStaffOrgService.deleteByStaffSidAndType(entity.getOrgSidPath(), sid, "3");
-            }else{
+            } else {
                 int count = sysStaffOrgService.selectByStaffAndOrg(entity.getOrgSidPath(), sid, "3");
                 SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(sid);
-                if(count>0){
+                if (count > 0) {
-                    return rb.setMsg(sysStaffinfo.getName()+"已在本部门，不能设置分管");
+                    return rb.setMsg(sysStaffinfo.getName() + "已在本部门，不能设置分管");
                 }
 
             }
+            //查询该人员的组织机构list
+            List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid);
+            List<String> orgList = new ArrayList<>();
+            if (sysStaffOrgVos.size() > 0) {
+                for (SysStaffOrgVo vv : sysStaffOrgVos) {
+                    String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+                    SysOrganization sysOrganization = fetchBySid(orgSid);
+                    if (sysOrganization != null) {
+                        orgList.add(orgSid);
+                    } else {
+                        continue;
+                    }
+                }
+            }
             //添加员工与组织的关联关系
             SysStaffOrg sysStaffOrg = new SysStaffOrg();
             sysStaffOrg.setManageType(manageType);
@@ -193,7 +212,31 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
                 }
             }
             sysStaffOrgService.save(sysStaffOrg);
+            //==========================添加清空变化的用户的token
+            List<SysStaffOrgVo> sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
+            List<String> orgList1 = new ArrayList<>();
+            if (sysStaffOrgVos1.size() > 0) {
+                for (SysStaffOrgVo vv : sysStaffOrgVos1) {
+                    String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+                    SysOrganization sysOrganization = fetchBySid(orgSid);
+                    if (sysOrganization != null) {
+                        orgList1.add(orgSid);
+                    } else {
+                        continue;
+                    }
+                }
+            }
+            List<String> reduce1 = orgList1.stream().filter(item -> !orgList.contains(item)).collect(toList());
+            if (reduce1.size() > 0) {
+                //根据staffSid查询token
+                String token = sysUserService.selectByStaffsid(sid).getToken();
+                //清空该token
+                redisUtil.remove(token);
+            }
+
+
         }
+
         return rb.success();
     }
 

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

@@ -12,6 +12,7 @@ import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost;
 import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo;
 import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto;
@@ -24,6 +25,7 @@ import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysstaffpost.SysStaffPostService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
 import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService;
+import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.Encodes;
@@ -39,6 +41,8 @@ import org.springframework.stereotype.Service;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import static java.util.stream.Collectors.toList;
+
 /**
  * Project: anrui_portal(门户建设) <br/>
  * File: SysStaffinfoService.java <br/>
@@ -71,6 +75,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
     private SysUserRoleService sysUserRoleService;
     @Autowired
     private SysRoleService sysRoleService;
+    @Autowired
+    private RedisUtil redisUtil;
 
     public List<SysStaffinfoAppContactsVo> selectAppContactsList() {
         List<SysStaffinfoAppContactsVo> list = baseMapper.selectAppContactsList();
@@ -413,6 +419,20 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
      */
     public ResultBean updateStaffInfo(SysStaffinfoDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
+        //查询该人员的组织机构list
+        List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid);
+        List<String> orgList = new ArrayList<>();
+        if (sysStaffOrgVos.size() > 0) {
+            for (SysStaffOrgVo vv : sysStaffOrgVos) {
+                String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+                if (sysOrganization != null) {
+                    orgList.add(orgSid);
+                } else {
+                    continue;
+                }
+            }
+        }
         //根据员工sid查询员工的信息
         SysStaffinfo sysStaffinfo = fetchBySid(sid);
         if (sysStaffinfo == null) {
@@ -519,6 +539,26 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (!isUpdate) {
             return rb.setMsg("更新员工信息失败");
         }
+        List<SysStaffOrgVo> sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid);
+        List<String> orgList1 = new ArrayList<>();
+        if (sysStaffOrgVos1.size() > 0) {
+            for (SysStaffOrgVo vv : sysStaffOrgVos1) {
+                String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
+                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+                if (sysOrganization != null) {
+                    orgList1.add(orgSid);
+                } else {
+                    continue;
+                }
+            }
+        }
+        List<String> reduce1 = orgList.stream().filter(item -> !orgList1.contains(item)).collect(toList());
+        if (reduce1.size() > 0) {
+            //根据staffSid查询token
+            String token = sysUserService.selectByStaffsid(sid).getToken();
+            //清空该token
+            redisUtil.remove(token);
+        }
         return rb.success().setMsg("更新员工信息成功");
     }
 

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

@@ -100,4 +100,6 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     int deleteByStaffSidAndType(@Param("sid") String sid, @Param("staffSid") String zgStaffSid, @Param("type") String type);
 
     List<SysStaffOrgVo> selectByStaffS(String staffSid);
+
+    List<String> selectByOrgSid(String sid);
 }

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

@@ -88,4 +88,8 @@
         from sys_staff_org
         where staffSid = #{staffSid}
     </select>
+
+    <select id="selectByOrgSid" resultType="java.lang.String">
+        select staffSid from sys_staff_org where orgSid = #{sid} and manageType = 2
+    </select>
 </mapper>

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

@@ -277,4 +277,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
     public List<SysStaffOrgVo> selectByStaffS(String staffSid) {
         return baseMapper.selectByStaffS(staffSid);
     }
+
+    public List<String> selectByOrgSid(String sid) {
+        return baseMapper.selectByOrgSid(sid);
+    }
 }

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

@@ -347,10 +347,11 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                     //根据orgSidPath查询分公司sid=====
                     String orgSid = sysStaffOrgService.getOrgByOrgSid(sysStaffOrgVo.getOrgSid());
                     SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
-                    if(sysOrganization != null){
+                    if (sysOrganization != null) {
                         userInfoOneVo.setDefaultOrgPathName(sysOrganization.getName());
-                        userInfoOneVo.setDefaultOrgPath(sysStaffOrgVo.getOrgSidPath());
+//                        userInfoOneVo.setDefaultOrgPath(sysStaffOrgVo.getOrgSidPath());
-                    }else{
+                        userInfoOneVo.setDefaultOrgPath(sysOrganization.getSid());
+                    } else {
                         userInfoOneVo.setDefaultOrgPathName("暂无组织机构");
                     }
                 }
@@ -368,9 +369,12 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 OrgList orgList1 = new OrgList();
                 String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
                 SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
-                if(sysOrganization != null){
+                if (sysOrganization != null) {
                     orgList1.setOrgName(sysOrganization.getName());
-                    orgList1.setOrgPath(vv.getOrgSidPath());
+//                    orgList1.setOrgPath(vv.getOrgSidPath());
+                    orgList1.setOrgPath(sysOrganization.getSid());
+                }else{
+                    continue;
                 }
                 orgList.add(orgList1);
             }