Merge remote-tracking branch 'origin/master_tuzuo' into master_tuzuo

src/main/java/com/sooka/sponest/data/emergency/appmin/base/AppBaseService.java

@@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class AppBaseService extends BaseService {
+public class AppBaseService {
     @Autowired
     private RemoteSystemBaseService remoteSystemBaseService;
 

src/main/java/com/sooka/sponest/data/emergency/appmin/index/domain/AppIndexVO.java

@@ -1,8 +1,9 @@
 package com.sooka.sponest.data.emergency.appmin.index.domain;
 
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
 import lombok.Data;
 
 @Data
-public class AppIndexVO extends BaseEntity {
+public class AppIndexVO extends BaseBusinessEntity {
 }

src/main/java/com/sooka/sponest/data/emergency/appmin/index/service/impl/AppIndexServiceImpl.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.emergency.appmin.index.service.impl;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.data.emergency.appmin.base.AppBaseService;
 import com.sooka.sponest.data.emergency.appmin.index.domain.AppIndexVO;
 import com.sooka.sponest.data.emergency.appmin.index.service.AppIndexService;
@@ -20,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-public class AppIndexServiceImpl extends AppBaseService implements AppIndexService {
+public class AppIndexServiceImpl extends BaseService implements AppIndexService {
 
     @Resource
     AppXunjianimgMapper appXunjianimgMapper;
@@ -36,11 +37,11 @@ public class AppIndexServiceImpl extends AppBaseService implements AppIndexServi
     @Override
     @DataScope(deptAlias = "e")
     public AjaxResult getIndexPageData(AppIndexVO appvo) {
-        AjaxResult ajaxResult = new AjaxResult();
         try {
             Map map = new HashMap<>();
             AppXunjianimgVO n = new AppXunjianimgVO();
             n.setParams(appvo.getParams());
+            setSookaDataBase(appvo);
             List<AppXunjianimgYinhuanBO> ls = appXunjianimgMapper.getXunjianimgListCount(n);
             String countStr = "";
             for (int i = 6; i > (ls.get(0).getXunjianListCount() + "").length(); i--) {
@@ -50,7 +51,7 @@ public class AppIndexServiceImpl extends AppBaseService implements AppIndexServi
             countStr = countStr.substring(0, 3) + "," + countStr.substring(3);
             TableDataInfo noticlist = remoteSystemBaseService.noticlist(1, 1);
 
-            return AjaxResult.success(!noticlist.getRows().isEmpty() ? noticlist.getRows().get(0) : null);
+            return AjaxResult.success(null != noticlist.getRows() ? noticlist.getRows().get(0) : null);
         } catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error("错误");

src/main/java/com/sooka/sponest/data/emergency/appmin/xuncha/service/impl/AppXunchaServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-public class AppXunchaServiceImpl extends AppBaseService implements AppXunchaService {
+public class AppXunchaServiceImpl extends BaseService implements AppXunchaService {
 
     @Resource
     AppXunchaMapper appXunchaMapper;

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/controller/AppXunjianController.java

@@ -48,7 +48,7 @@ public class AppXunjianController {
 
 
     @RequestMapping("getBusInspectionIsRiskByEnterpriseCount")
-    public AjaxResult getBusInspectionIsRiskByEnterpriseCount(AppXunjianVO vo) {
+    public AjaxResult getBusInspectionIsRiskByEnterpriseCount(@RequestBody AppXunjianVO vo) {
         return appXunjianService.getBusInspectionIsRiskByEnterpriseCount(vo);
     }