数据概览定时任务修改

fs-service/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java

@@ -698,8 +698,10 @@ public class StatisticsServiceImpl implements IStatisticsService {
         dealerAggregatedDTO.setRecvTodayNum(dayPaymentCount);
         dealerAggregatedDTO.setGoodsTotalNum(productCount);
         dealerAggregatedDTO.setTodayGoodsNum(dayProductCount);
-        dealerAggregatedDTO.setPadTotalNum(padInfo.getTotalCount());
-        dealerAggregatedDTO.setPadUsedNum(padInfo.getCount());
+        if (padInfo != null){
+            dealerAggregatedDTO.setPadTotalNum(padInfo.getTotalCount());
+            dealerAggregatedDTO.setPadUsedNum(padInfo.getCount());
+        }
         return dealerAggregatedDTO;
     }
 

fs-service/src/main/resources/mapper/company/CompanyUserMapper.xml

@@ -64,6 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="qrCodeWecom" column="qr_code_wecom"/>
         <result property="jpushId" column="jpush_id"/>
         <result property="callerNo" column="caller_no"/>
+        <result property="isNeedRegisterMember"    column="is_need_register_member" />
+        <result property="isAllowedAllRegister"    column="is_allowed_all_register" />
         <collection property="roleNames" ofType="java.lang.String" javaType="java.util.ArrayList">
             <result column="role_name"/>
         </collection>
@@ -91,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         u.user_id, u.user_name, u.nick_name, u.company_id, u.status,
         u.qw_status, u.phonenumber, u.create_time, u.dept_id,
         u.qr_code_weixin, u.user_type, u.qr_code_wecom, u.jpush_id,
+        u.is_need_register_member,u.is_allowed_all_register,
         u.avatar,
         u.qw_user_id,
         d.dept_name,