功能调整

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/workContract/mapper/WorkContractInfoMapper.java

@@ -1,5 +1,6 @@
 package com.jeeplus.assess.workContract.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,12 +23,16 @@ public interface WorkContractInfoMapper extends BaseMapper<WorkContractInfo> {
 
     WorkContractInfo findById (@Param("id") String id);
 
+    @InterceptorIgnore(tenantLine = "true")
     Integer findIsExit(@Param("id") String id, @Param("name")String name);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachment> findList(@Param("id") String id);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentDto> findDtos(@Param("id") String id);
 
+    @InterceptorIgnore(tenantLine = "true")
     List<WorkAttachmentDto> findByAttachmentIdAndFlag(@Param("attachmentId") String id,@Param("attachmentFlag") String attachmentFlag);
 
     void updateStatusById(@Param("id") String id, @Param("status")String status);

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/common/handler/ExtUserTaskActivityBehavior.java

@@ -122,7 +122,8 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         if(flowAssignee.getValue ().contains("currentUserSql:")){
                             //对应sql为：select su.* from sys_user_role a left join sys_role sr on sr.id = a.role_id left join sys_user su on su.id = a.user_id left join sys_office so on so.id = su.office_id where sr.en_name= 'bmzr' and so.id = (select office_id from sys_user where id = @currentUser.id)
                             //用于查询当前登录人的部门主任人员信息
-                            UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getLoginUser ();
+                            //获取当前登录人信息
+                            UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
                             String sql = flowAssignee.getValue ();
                             if(sql.contains("@currentUser.id")){
                                 //将标志进行去除
@@ -161,7 +162,8 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         if(flowAssignee.getValue ().contains("zsbxCurrentUserSql:")){
                             //对应sql为：select su.* from sys_user_role a left join sys_role sr on sr.id = a.role_id left join sys_user su on su.id = a.user_id left join sys_office so on so.id = su.office_id where sr.en_name= 'bmzr' and so.id = (select office_id from sys_user where id = @currentUser.id)
                             //用于查询当前登录人的部门主任人员信息
-                            UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getLoginUser ();
+                            //获取当前登录人信息
+                            UserDTO currentUserDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
                             String sql = flowAssignee.getValue ();
                             if(sql.contains("@currentUser.id")){
                                 //将标志进行去除

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/serialNumTpl/mapper/SerialnumTplMapper.java

@@ -18,5 +18,6 @@ public interface SerialnumTplMapper extends BaseMapper<SysSerialnumTpl> {
 
     void resetSerialNum(@Param("id")String id,@Param("yearBuilt")String yearBuilt,@Param("newYear")String newYear);
 
+    @InterceptorIgnore(tenantLine = "true")
     int updateSerialNum(SysSerialnumTpl numTpl);
 }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/serialNumTpl/service/SerialnumTplService.java

@@ -7,6 +7,7 @@ import com.jeeplus.pubmodules.serialNumTpl.domain.SysSerialnumTpl;
 import com.jeeplus.pubmodules.serialNumTpl.mapper.SerialnumTplMapper;
 import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.mapper.OfficeMapper;
+import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -74,7 +75,7 @@ public class SerialnumTplService {
     public String genSerialNum(String companyId, String bizCode) throws Exception {
         //获取当前登录人信息
         UserDTO dto = UserUtils.getCurrentUserDTO();
-        Office office = officeMapper.selectById(companyId);
+        OfficeDTO office = officeMapper.getOfficeById(companyId);
         if (StringUtils.isBlank(bizCode)){
             throw new Exception("生成编号失败，业务类型不能为空");
         }
@@ -146,7 +147,7 @@ public class SerialnumTplService {
     public String genSerialNumNoSort(String companyId, String bizCode) throws Exception {
         //获取当前登录人信息
         UserDTO dto = UserUtils.getCurrentUserDTO();
-        Office office = officeMapper.selectById(companyId);
+        OfficeDTO office = officeMapper.getOfficeById(companyId);
         if (StringUtils.isBlank(bizCode)){
             throw new Exception("生成编号失败，业务类型不能为空");
         }
@@ -215,7 +216,7 @@ public class SerialnumTplService {
     public String genSerialReviewNum(String companyId, String bizCode) throws Exception {
         //获取当前登录人信息
         UserDTO dto = UserUtils.getCurrentUserDTO();
-        Office office = officeMapper.selectById(companyId);
+        OfficeDTO office = officeMapper.getOfficeById(companyId);
         if (StringUtils.isBlank(bizCode)){
             throw new Exception("生成编号失败，业务类型不能为空");
         }
@@ -283,10 +284,10 @@ public class SerialnumTplService {
         return "";
     }
 
-    private SysSerialnumTpl querySerialTpl(Office company, String bizCode) {
+    private SysSerialnumTpl querySerialTpl(OfficeDTO company, String bizCode) {
         SysSerialnumTpl numTpl = serialnumTplMapper.queryByComAndBizCode(company.getId(), bizCode);
         if (numTpl==null && company.getParentId()!=null && !"0".equals(company.getParentId())){
-            Office office = officeMapper.selectById(company.getParentId());
+            OfficeDTO office = officeMapper.getOfficeById(company.getParentId());
             numTpl = this.querySerialTpl(office,bizCode);
         }
         return numTpl;

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/OfficeMapper.java

@@ -27,6 +27,7 @@ public interface OfficeMapper extends TreeMapper <Office> {
      * @param id
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     OfficeDTO getOfficeById(String id);
 
     @InterceptorIgnore(tenantLine = "true")

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/OfficeMapper.xml

@@ -8,7 +8,7 @@
         a.parent_ids as "parentIds",
         a.name as "name",
         a.sort as "sort",
-        a.area_id as "areaId",
+        a.area as "areaId",
         a.code as "code",
         a.type as "type",
         a.grade as "grade",