Merge remote-tracking branch 'origin/master'

jeeplus-common/jeeplus-common-mybatis-plus/src/main/java/com/jeeplus/config/TenantLineHandlerImpl.java

@@ -101,6 +101,8 @@ public class TenantLineHandlerImpl implements TenantLineHandler {
             switch (tableName) {
                 case "sys_user":
                 case "sys_office":
+                case "sys_role":
+                case "sys_post":
                     return true;
             }
         }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/service/FinanceInvoiceService.java

@@ -282,6 +282,10 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
         if (StringUtils.isNotBlank(financeInvoiceDTO.getName())){
             queryWrapper.like("fi.name",financeInvoiceDTO.getName());
         }
+        //开票类型筛选
+        if (StringUtils.isNotBlank(financeInvoiceDTO.getBillingType())){
+            queryWrapper.eq("fi.billing_type",financeInvoiceDTO.getBillingType());
+        }
 
         IPage<FinanceInvoiceDTO> pageList = financeInvoiceMapper.findList(page, queryWrapper);
         pageList.getRecords().stream().forEach(item ->{

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/program/configuration/projectList/service/ProjectListService.java

@@ -908,11 +908,14 @@ public class ProjectListService {
                     item.setIsOver(isOver);
                     continue;
                 }
-                //签字评估师1 签字评估师2
-                if (StringUtils.isBlank(item.getSignatureEvaluatorFirst()) || StringUtils.isBlank(item.getSignatureEvaluatorSecond())){
-                    isOver=false;
-                    item.setIsOver(isOver);
-                    continue;
+                //判定，如果是咨询项目，则签字评估师不需要填写
+                if(StringUtils.isNotBlank(item.getReportType()) && !"2".equals(item.getReportType())){
+                    //签字评估师1 签字评估师2
+                    if (StringUtils.isBlank(item.getSignatureEvaluatorFirst()) || StringUtils.isBlank(item.getSignatureEvaluatorSecond())){
+                        isOver=false;
+                        item.setIsOver(isOver);
+                        continue;
+                    }
                 }
                 //废旧物资评估（万元） 固定资产评估（万元） 净资产评估 租金评估（万/年）
                 if (StringUtils.isBlank(item.getWaystEvaluation()) && StringUtils.isBlank(item.getNetAssetsEvaluation()) && StringUtils.isBlank(item.getRentEvaluation()) && StringUtils.isBlank(item.getFixedAssetsEvaluation())){
@@ -1058,11 +1061,15 @@ public class ProjectListService {
                     item.setIsOver(isOver);
                     break;
                 }
-                //签字评估师1 签字评估师2
-                if (StringUtils.isBlank(item.getSignatureEvaluatorFirst()) || StringUtils.isBlank(item.getSignatureEvaluatorSecond())){
-                    isOver=false;
-                    item.setIsOver(isOver);
-                    break;
+
+                //判定，如果是咨询项目，则签字评估师不需要填写
+                if(StringUtils.isNotBlank(item.getReportType()) && !"2".equals(item.getReportType())){
+                    //签字评估师1 签字评估师2
+                    if (StringUtils.isBlank(item.getSignatureEvaluatorFirst()) || StringUtils.isBlank(item.getSignatureEvaluatorSecond())){
+                        isOver=false;
+                        item.setIsOver(isOver);
+                        continue;
+                    }
                 }
                 //废旧物资评估（万元） 固定资产评估（万元） 净资产评估 租金评估（万/年）
                 if (StringUtils.isBlank(item.getWaystEvaluation()) && StringUtils.isBlank(item.getNetAssetsEvaluation()) && StringUtils.isBlank(item.getRentEvaluation()) && StringUtils.isBlank(item.getFixedAssetsEvaluation())){

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/ReimbursementInfoMapper.java

@@ -26,6 +26,13 @@ public interface ReimbursementInfoMapper extends BaseMapper<ReimbursementInfo> {
 
     List<TreeUserDto> findOfficeList();
 
+    /**
+     * 查询非指定租户的所有部门信息
+     * @param tenantId
+     * @return
+     */
+    List<TreeUserDto> findOfficeListByNotTenantId(String tenantId);
+
     @InterceptorIgnore(tenantLine = "true")
     List<TreeUserDto> findOfficeList2();
 

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -119,6 +119,10 @@
 		SELECT id,`name`,parent_id FROM sys_office WHERE del_flag = 0
 	</select>
 
+	<select id="findOfficeListByNotTenantId" resultType="com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.TreeUserDto">
+		SELECT id,`name`,parent_id FROM sys_office WHERE del_flag = 0 and tenant_id != #{tenantId}
+	</select>
+
 	<select id="findOfficeList2" resultType="com.jeeplus.assess.reimbursement.reimbursementInfo.service.dto.TreeUserDto">
 		SELECT id,`name`,parent_id FROM sys_office WHERE del_flag = 0
 	</select>

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -691,9 +691,13 @@ public class ReimbursementInfoService {
     public List<TreeUserDto> userTree(String name) {
         UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
         List<TreeUserDto> list = new ArrayList<>();
-
+        List<TreeUserDto> officeList = Lists.newArrayList();
         // 查询部门
-        List<TreeUserDto> officeList = infoMapper.findOfficeListByCompanyId(userDTO.getCompanyDTO().getId());
+        if(userDTO.isAdmin() || (null != userDTO.getTenantDTO() && "10002".equals(userDTO.getTenantDTO().getId()))){
+            officeList = infoMapper.findOfficeListByNotTenantId("10000");
+        }else{
+            officeList = infoMapper.findOfficeListByCompanyId(userDTO.getCompanyDTO().getId());
+        }
         List<TreeUserDto> filterList = new ArrayList<>();
         filterList.addAll(officeList);
         //查询综合管理公司