补充校区信息

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtTerminalUserController.java

@@ -10,7 +10,6 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.util.BeanUtil;
 import cn.rankin.common.utils.util.ListUtil;
-import cn.rankin.common.utils.util.ProvinceUtil;
 import cn.rankin.data.api.product.vo.ProductVo;
 import cn.rankin.data.api.user.dto.CampusSearchDTO;
 import cn.rankin.data.api.user.dto.TerminalUserSearchDTO;
@@ -66,7 +65,7 @@ public class StmtTerminalUserController
 
         List<TerminalUserAuthVo> terminalUserAuthVos = authVoPage.getList();
         setProductInfo(terminalUserAuthVos);
-        //setCampusInfo(terminalUserAuthVos);
+        setCampusInfo(terminalUserAuthVos);
 
         return APIResult.ok(authVoPage);
 
@@ -75,7 +74,7 @@ public class StmtTerminalUserController
     /**
      * 查询已开通校区报表
      *
-     * @param user            the user info
+     * @param user      the user info
      * @param searchDTO the campus search
      * @return
      */
@@ -105,7 +104,7 @@ public class StmtTerminalUserController
         sheet.setColumnWidth(4, 10 * 256);
         sheet.setColumnWidth(5, 15 * 256);
         sheet.setColumnWidth(6, 15 * 256);
-        sheet.setColumnWidth(7, 50* 256);
+        sheet.setColumnWidth(7, 50 * 256);
         //在sheet里创建第一行，参数为行索引(excel的行)，可以是0～65535之间的任何一个
         HSSFRow row1 = sheet.createRow(0);
         //创建单元格并设置单元格内容
@@ -200,17 +199,20 @@ public class StmtTerminalUserController
             return;
         }
 
-        for(TerminalUserAuthVo vo : terminalUserAuthVos)
+        for (TerminalUserAuthVo vo : terminalUserAuthVos)
         {
-           String campusId =  vo.getCampusId();
+            String campusId = vo.getCampusId();
 
-            APIResult<CampusVo> apiResult = campusService.getCampus(campusId);
-            CampusVo campusVo = apiResult.getData();
-            if(campusVo!=null)
+            if (campusId != null && campusId.trim() != "")
             {
-                vo.setCampusName(campusVo.getName());
-                vo.setCampusContactName(campusVo.getContactName());
-                vo.setCampusContactWay(campusVo.getMobile());
+                APIResult<CampusVo> apiResult = campusService.getCampus(campusId);
+                CampusVo campusVo = apiResult.getData();
+                if (campusVo != null)
+                {
+                    vo.setCampusName(campusVo.getName());
+                    vo.setCampusContactName(campusVo.getContactName());
+                    vo.setCampusContactWay(campusVo.getMobile());
+                }
             }
         }