部门

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckTaskController.java

@@ -460,24 +460,59 @@ public class SmsCheckTaskController extends JeecgController<SmsCheckTask, ISmsCh
         Map<String, SysDepartModel> sysDepartModelMap
                 = sysDepartModel.stream().collect(Collectors.toMap(SysDepartModel::getOrgCode,Function.identity(), (o, n) -> o));
         //员工二级部门
-        if (StringUtils.isNotBlank(orgCode) &&orgCode.length()>9){
-            String towString = orgCode.substring(0, 9);
-            SysDepartModel sysDepartModelTow= sysDepartModelMap.get(towString);
-            if (sysDepartModelTow!=null){
-                vo.setStaffDeptLevel2No(sysDepartModelTow.getOrgCode());
-                vo.setStaffDeptLevel2Name(sysDepartModelTow.getDepartName());
-                vo.setStaffDeptLevel2(sysDepartModelTow.getDepartName()+"("+sysDepartModelTow.getOrgCode()+")");
-            }
-            //员工三级部门
-            String threeString = orgCode.substring(0, 13);
-            SysDepartModel sysDepartModelThree = sysDepartModelMap.get(threeString);
-            if (sysDepartModelThree!=null){
-                vo.setStaffDeptLevel3No(sysDepartModelThree.getOrgCode());
-                vo.setStaffDeptLevel3Name(sysDepartModelThree.getDepartName());
-                vo.setStaffDeptLevel3(sysDepartModelThree.getDepartName()+"("+sysDepartModelThree.getOrgCode()+")");
+        if (sysUser!=null){
+            List<String> deptNameByUserId = taskService.getDeptNameByUserId( sysUser.getWorkNo());
+            if (!deptNameByUserId.isEmpty()){
+                Set<String>strings=new HashSet<>();
+                Set<String>stringsOrg=new HashSet<>();
+                Set<String>stringsThree=new HashSet<>();
+                Set<String>stringsThreeOrg=new HashSet<>();
+                for (String s : deptNameByUserId) {
+                    if (s.length()>=3){
+                        String substring = s.substring(0, 3);
+                        strings.add(sysDepartModelMap.get(substring).getDepartName());
+                        stringsOrg.add(substring);
+                    }
+                    if (s.length()>=6){
+                        String substring = s.substring(0, 6);
+                        stringsThree.add(sysDepartModelMap.get(substring).getDepartName());
+                        stringsThreeOrg.add(substring);
+                    }
+                }
+                vo.setStaffDeptLevel2No(stringsOrg.toString());
+                vo.setStaffDeptLevel2Name(strings.toString());
+                vo.setStaffDeptLevel2(strings.toString()+"("+stringsOrg.toString()+")");
+                vo.setStaffDeptLevel3No(stringsThreeOrg.toString());
+                vo.setStaffDeptLevel3Name(stringsThree.toString());
+                vo.setStaffDeptLevel3(stringsThree.toString()+"("+stringsThreeOrg.toString()+")");
             }
         }
 
+        //员工三级部门
+
+//        if (!deptNameByUserIds.isEmpty()){
+//            vo.setStaffDeptLevel2No(sysDepartModelTow.getOrgCode());
+//            vo.setStaffDeptLevel3Name(deptNameByUserIds.toString());
+//            vo.setStaffDeptLevel2(sysDepartModelTow.getDepartName()+"("+sysDepartModelTow.getOrgCode()+")");
+//        }
+//        if (StringUtils.isNotBlank(orgCode) &&orgCode.length()>9){
+//            String towString = orgCode.substring(0, 9);
+//            SysDepartModel sysDepartModelTow= sysDepartModelMap.get(towString);
+//            if (sysDepartModelTow!=null){
+//                vo.setStaffDeptLevel2No(sysDepartModelTow.getOrgCode());
+//                vo.setStaffDeptLevel2Name(sysDepartModelTow.getDepartName());
+//                vo.setStaffDeptLevel2(sysDepartModelTow.getDepartName()+"("+sysDepartModelTow.getOrgCode()+")");
+//            }
+//            //员工三级部门
+//            String threeString = orgCode.substring(0, 13);
+//            SysDepartModel sysDepartModelThree = sysDepartModelMap.get(threeString);
+//            if (sysDepartModelThree!=null){
+//                vo.setStaffDeptLevel3No(sysDepartModelThree.getOrgCode());
+//                vo.setStaffDeptLevel3Name(sysDepartModelThree.getDepartName());
+//                vo.setStaffDeptLevel3(sysDepartModelThree.getDepartName()+"("+sysDepartModelThree.getOrgCode()+")");
+//            }
+      //  }
+
 
 //        // 拆分员工二级部门
 //        String staffDeptLevel2 = vo.getStaffDeptLevel2();

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/SmsCheckTaskMapper.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.smscheck.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.smscheck.entity.SmsCheckTask;
 
+import java.util.List;
+
 /**
  * @description 行短稽核任务
  * @author jeecg-boot
@@ -10,5 +13,11 @@ import org.jeecg.modules.smscheck.entity.SmsCheckTask;
  * @version V1.0
  */
 public interface SmsCheckTaskMapper extends BaseMapper<SmsCheckTask> {
-
+    @Select("SELECT d.org_code " +
+            "FROM sys_user_depart ud,sys_depart d,sys_user u " +
+            "WHERE d.id = ud.dep_id " +
+            "and u.id = ud.user_id  " +
+//            "and org_type = #{orgType} " +
+            "and u.work_no = #{workNo} ")
+    List<String> getDeptNameByUserId( String workNo);
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/ISmsCheckTaskService.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.smscheck.service;
 import org.jeecg.modules.smscheck.entity.SmsCheckTask;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @description 行短稽核任务
  * @author jeecg-boot
@@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISmsCheckTaskService extends IService<SmsCheckTask> {
 
+    List<String> getDeptNameByUserId( String workNo);
 }