安装告知列表权限处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -42,8 +42,9 @@
             </if>
             <if test="type == 'supervision'">
                 AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )
+                AND isn.receive_org_credit_code = #{orgCode}
             </if>
-            <if test="orgCode != null and orgCode != ''">
+            <if test="type == 'enterprise'">
                 AND isn.install_unit_credit_code = #{orgCode}
             </if>
         </where>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -240,11 +240,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     public Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type , ReginParams reginParams) {
 
         String orgCode;
-        if(type.equals("enterprise")) {
-            orgCode = reginParams.getCompany().getCompanyCode();
-        } else {
-            orgCode = reginParams.getCompany().getOrgCode();
-        }
+        orgCode = reginParams.getCompany().getOrgCode();
 
         Page<JgInstallationNotice> noticePage = jgInstallationNoticeMapper.queryForPage(page, model, type, orgCode);