jsk 检验预警 权限改造-数字

bonus-modules/bonus-material/src/main/java/com/bonus/material/expectations/service/impl/ExpectationsServiceImpl.java

@@ -59,6 +59,11 @@ public class ExpectationsServiceImpl implements ExpectationsService {
     @Override
     public AjaxResult getCountExpectations(ExpectationsEntity entity) {
         try {
+            /**
+             * jsk
+             */
+            Long companyId=iTypeService.getUserDeptId();
+            entity.setCompanyId(companyId);
             Map<String, Objects> countExpectations = mapper.getCountExpectations(entity);
             if (entity != null && "2".equals(entity.getUseStatus())) {
                 //在用设备量

bonus-modules/bonus-material/src/main/resources/mapper/material/expectations/ExpectationsMapper.xml

@@ -33,7 +33,7 @@
             )
         </if>
         <if test="companyId != null and companyId != ''">
-            AND mm.company_id=#{companyId}
+            AND mt1.company_id=#{companyId}
         </if>
         GROUP BY
         mm.type_id,
@@ -55,6 +55,9 @@
         WHERE mm.ma_status = #{useStatus}
         AND mm.next_check_time &lt; DATE_ADD(CURDATE(), INTERVAL 30 DAY)
         AND mt2.type_id not in (6032,6008,6270)
+        <if test="companyId != null and companyId != ''">
+            AND mt.company_id=#{companyId}
+        </if>
         GROUP BY name;
     </select>
     <select id="getListDetails" resultType="com.bonus.material.expectations.domain.ExpectationsEntity">