duyj 3 anos atrás
pai
commit
7492d22896

+ 1 - 1
suishenbang-sync/suishenbang-sync-manager/src/main/java/com/dgtly/sync/controller/SyncController.java

@@ -66,7 +66,7 @@ public class SyncController {
     public Object user(String packageId, String jobId, String message){
         try{
             analysisSysUserService.analysisSysUser(null);
-//            analysisSysUserService.analysisSysCwUser(null);
+            analysisSysUserService.analysisSysCwUser(null);
         }catch (Exception e){
             log.error("解析用户出错",e);
         }

+ 1 - 1
suishenbang-sync/suishenbang-sync-manager/src/main/java/com/dgtly/sync/controller/SyncLogController.java

@@ -110,7 +110,7 @@ public class SyncLogController extends BaseController
     public Object user(){
         try{
             analysisSysUserService.analysisSysUser(null);
-//            analysisSysUserService.analysisSysCwUser(null);
+            analysisSysUserService.analysisSysCwUser(null);
         }catch (Exception e){
             logger.error("解析用户出错",e);
         }

+ 8 - 8
suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/WxMagnetServiceImpl.java

@@ -204,14 +204,14 @@ public class WxMagnetServiceImpl implements IWxMagnetService
      */
     @Override
     public List<WxMagnet> selectMagnetByUserId(String userId, String cw, String salesLevel) {
-//        List<WxMagnet> list;
-//        if (null != cw && null != salesLevel && "customer_level".equals(salesLevel)) {
-//            String roleId = cw.equals("1") ? configService.selectConfigByKey("libang.customer.roleid") : configService.selectConfigByKey("libang.cw.roleid");
-//            list = wxMagnetMapper.selectMagnetByCw(userId, roleId);
-//        } else {
-//            list = wxMagnetMapper.selectMagnetByUserId(userId);
-//        }
-        List<WxMagnet> list  = wxMagnetMapper.selectMagnetByUserId(userId);
+        List<WxMagnet> list;
+        if (null != cw && null != salesLevel && "customer_level".equals(salesLevel)) {
+            String roleId = cw.equals("1") ? configService.selectConfigByKey("libang.customer.roleid") : configService.selectConfigByKey("libang.cw.roleid");
+            list = wxMagnetMapper.selectMagnetByCw(userId, roleId);
+        } else {
+            list = wxMagnetMapper.selectMagnetByUserId(userId);
+        }
+//        List<WxMagnet> list  = wxMagnetMapper.selectMagnetByUserId(userId);
         if(list!=null && list.size()>0){
             for(WxMagnet wxMagnet: list){
                 logger.info("isEncry::::"+wxMagnet.getIsEncry());