1. "上海人寿"部门编号（渠道号）支持null和0两种值

2. 修复了客户概览页保单信息计算错误问题

dgtis-modules/dgtis-modules-data/src/main/java/com/dgtis/data/api/CustomerApiController.java

@@ -80,7 +80,11 @@ public class CustomerApiController {
             //模糊查询渠道
             Long userId = SecurityUtils.getUserId();
             SysUser sysUser = userService.selectUserById(userId);
-            String deptCode = sysUser.getDept().getDeptCode();
+            String deptCode = null;
+            // “上海人寿”部门编号开发环境是null，生产环境是0。不是上海人寿部门的才分渠道
+            if (StringUtils.isNotEmpty(sysUser.getDept().getDeptCode()) && ! "0".equals(sysUser.getDept().getDeptCode())) {
+                deptCode = sysUser.getDept().getDeptCode();
+            }
             logger.info("进客户列表时间："+DateUtils.getTime());
             /*Long userId = SecurityUtils.getUserId();
             SysUser sysUser = userService.selectUserById(userId);
@@ -332,7 +336,8 @@ public class CustomerApiController {
           Long userId = SecurityUtils.getUserId();
           SysUser sysUser = userService.selectUserById(userId);
           String deptCode = "";
-          if(StringUtils.isNotEmpty( sysUser.getDept().getDeptCode())){
+          // “上海人寿”部门编号开发环境是null，生产环境是0。不是上海人寿部门的才分渠道
+          if(StringUtils.isNotEmpty( sysUser.getDept().getDeptCode()) && ! "0".equals(sysUser.getDept().getDeptCode())){
               deptCode = sysUser.getDept().getDeptCode();
           }
            logger.info("进客户详情时间："+DateUtils.getTime());
@@ -459,7 +464,11 @@ public class CustomerApiController {
     public AjaxResult getCustomerOverViewById(String id) {
         Long userId = SecurityUtils.getUserId();
         SysUser sysUser = userService.selectUserById(userId);
-        String deptCode = sysUser.getDept().getDeptCode();
+        String deptCode = null;
+        // “上海人寿”部门编号开发环境是null，生产环境是0。不是上海人寿部门的才分渠道
+        if (StringUtils.isNotEmpty(sysUser.getDept().getDeptCode()) && ! "0".equals(sysUser.getDept().getDeptCode())) {
+            deptCode = sysUser.getDept().getDeptCode();
+        }
         // 获取索引的别名，字段，创建时间http://10.32.2.231:9200/shanglifeecif.individual/default_type_/1
         try {
             logger.info("进客户概览时间："+DateUtils.getTime());
@@ -536,7 +545,7 @@ public class CustomerApiController {
                     insureDay = DateUtils.getDateDifDay(new Date(),padate);
                 }
                 if("有效".equals(_source.getString("policystate"))){
-                    novpolicyset.add(_source.getString("iaid"));
+                    novpolicyset.add(_source.getString("policyno"));
 
                     if(_source.containsKey("sumprem")){
                         sumprem+=_source.getDouble("sumprem");
@@ -642,9 +651,8 @@ public class CustomerApiController {
                             Date pindate = _source.getDate("pindate");//起保日期
                             guaranteeDay+=DateUtils.getDateDifDay(pmdate,pindate);
                         }
-                        noivpolicyset.add(_source.getString("iaid"));
-
                     }
+                    noivpolicyset.add(_source.getString("policyno"));
                 }
 
             }
@@ -804,7 +812,11 @@ public class CustomerApiController {
 
            Long userId = SecurityUtils.getUserId();
             SysUser sysUser = userService.selectUserById(userId);
-            String deptCode = sysUser.getDept().getDeptCode();
+            String deptCode = null;
+            // “上海人寿”部门编号开发环境是null，生产环境是0。不是上海人寿部门的才分渠道
+            if (StringUtils.isNotEmpty(sysUser.getDept().getDeptCode()) && ! "0".equals(sysUser.getDept().getDeptCode())) {
+                deptCode = sysUser.getDept().getDeptCode();
+            }
             //1.如果存在保单信息的查询条件，需要先查询保单信息然后通过保单关联出客户信息
             //处理保单查询条件
             /*List<String> customerIds = new ArrayList<String>();