1.通过工号获取部门名称

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

@@ -1,12 +1,7 @@
 package org.jeecg.modules.smscheck.controller;
-
-
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Dict;
-import cn.hutool.core.lang.Tuple;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.druid.sql.visitor.functions.If;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,7 +9,6 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.shiro.SecurityUtils;
@@ -22,24 +16,17 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.MinioUtil;
-import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.smscheck.configs.CheckStateCode;
 import org.jeecg.modules.smscheck.configs.CheckTypeCode;
-import org.jeecg.modules.smscheck.configs.ShutdownLabelByCode;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.entity.excel.SpecialExaminationExport;
 import org.jeecg.modules.smscheck.service.*;
-import org.jeecg.modules.smscheck.vo.SmsCheckCustomerInfoVo;
 import org.jeecg.modules.smscheck.vo.SpecialExaminationCustomerVo;
 import org.jeecg.modules.smscheck.vo.SpecialExaminationVo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -51,12 +38,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
@@ -72,7 +57,6 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
     @Resource
     private SpecialExaminationService specialExaminationService;
 
-
     @Autowired
     private ISmsCheckCustomerInfoService customerInfoService;
 
@@ -89,11 +73,9 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
      */
     @Autowired
     private ISmsCheckCustomerInfoService infoService;
-    /**
-     * 底层共通业务API，提供其他独立模块调用
-     */
-    @Autowired
-    private ISysBaseAPI sysBaseApi;
+
+
+
 
 
     @ApiOperation(value = "客户资料-信息查询查询", notes = "客户资料-个人列表查询")

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

@@ -13,8 +13,6 @@ import java.util.Map;
  */
 public interface SpecialExaminationService extends IService<SpecialExamination> {
 
-
-
     /**
      * 获取特审复开数据
      * @param infoId

tnc-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.entity.SysUserDepart;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,4 +39,12 @@ public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
 	 * @return
 	 */
 	IPage<SysUser> queryDepartUserPageList(Page<SysUser> page, @Param("orgCode") String orgCode, @Param("username") String username, @Param("realname") String realname);
+
+	@Select("SELECT d.depart_name " +
+			"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 orgType, String workNo);
 }

tnc-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -158,4 +158,6 @@ public interface ISysDepartService extends IService<SysDepart>{
      * @return
      */
     List<SysDepart> queryDeptByPid(String pid);
+
+
 }

tnc-system/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java

@@ -53,4 +53,12 @@ public interface ISysUserDepartService extends IService<SysUserDepart> {
 	 */
 	IPage<SysUser> queryDepartUserPageList(String departId, String username, String realname, int pageSize, int pageNo);
 
+	/**
+	 * 查找用户的部门名称
+	 * @param orgType  1：用户发展二级部门 2：用户发展三级部门
+	 * @param workNo 用户工号
+	 * @return
+	 */
+	List<String> getDeptNameByUserId(String orgType,String workNo);
+
 }

tnc-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -13,6 +13,7 @@ import org.jeecg.common.constant.FillRuleConstant;
 import org.jeecg.common.util.FillRuleUtil;
 import org.jeecg.common.util.YouBianCodeUtil;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.smscheck.service.ISysUserService;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.mapper.*;
 import org.jeecg.modules.system.model.DepartIdModel;
@@ -24,6 +25,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.text.Collator;
 import java.util.*;
 import java.util.function.Consumer;
@@ -40,19 +42,23 @@ import java.util.stream.Collectors;
 @Service
 public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart> implements ISysDepartService {
 
-	@Autowired
+	@Resource
 	private SysUserDepartMapper userDepartMapper;
-	@Autowired
+	@Resource
 	private SysDepartRoleMapper sysDepartRoleMapper;
-	@Autowired
+	@Resource
 	private SysDepartPermissionMapper departPermissionMapper;
-	@Autowired
+	@Resource
 	private SysDepartRolePermissionMapper departRolePermissionMapper;
-	@Autowired
+	@Resource
 	private SysDepartRoleUserMapper departRoleUserMapper;
-	@Autowired
+	@Resource
 	private SysUserMapper sysUserMapper;
 
+	// 用户相关业务
+	@Resource
+	private ISysUserService sysUserService;
+
 	@Override
 	public List<SysDepartTreeModel> queryMyDeptTreeList(String departIds) {
 		//根据部门id获取所负责部门
@@ -636,6 +642,8 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 	public List<SysDepart> queryDeptByPid(String pid) {
 		return this.baseMapper.queryDeptByPid(pid);
 	}
+
+
 	/**
      * 根据关键字筛选部门信息
      * @param keyWord

tnc-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.constant.CommonConstant;
@@ -18,6 +19,7 @@ import org.jeecg.modules.system.vo.SysUserDepVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -37,6 +39,8 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 	private ISysDepartService sysDepartService;
 	@Autowired
 	private SysUserMapper sysUserMapper;
+	@Resource
+	SysUserDepartMapper sysUserDepartMapper;
 	
 
 	/**
@@ -160,6 +164,20 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 		return pageList;
 	}
 
+	/**
+	 * 查找用户部门名称
+	 * @param orgType  1：用户发展二级部门 2：用户发展三级部门
+	 * @param workNo 用户工号
+	 * @return
+	 */
+	@Override
+	public List<String> getDeptNameByUserId(String orgType, String workNo) {
+		if (StringUtils.isEmpty(workNo)){
+			return null;
+		}
+		return sysUserDepartMapper.getDeptNameByUserId(orgType,workNo);
+	}
+
 	/**
 	 * 升级SpringBoot2.6.6,不允许循环依赖
 	 * @param userIds