Merge branch 'div-20251117' of http://git.dgtis.com/qxp/suishenbang-oneportal into div-20251117

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

@@ -89,7 +89,7 @@ public class AnalysisDiyCustomerComponent {
 
 
     public SyncLog analyDiyCustomer1() {
-
+        log.info("开始同步经销商用户B");
         if (roleMsq == null) {
             Long roleId = Long.parseLong(configService.selectConfigByKey("libang.msq.roleid"));
             roleMsq = new Long[]{roleId};
@@ -228,6 +228,7 @@ public class AnalysisDiyCustomerComponent {
      */
     //@Override
     public SyncLog analyDiyCustomer() {
+        log.info("开始解析DIY经销商用户A");
         if(deptId==null){
             deptId = Long.parseLong(configService.selectConfigByKey("libang.customer.deptid"));
         }
@@ -788,6 +789,9 @@ public class AnalysisDiyCustomerComponent {
      */
     public Integer buildSysUser(JSONArray jsonArray, Set<String> loginNameSet,Set<String> diyNameSet, int isManager, List<SyncFailDetail> failDetails,String packageId, Map<String,Customers> cusMap) {
         // JSONArray jsonArray = json.getJSONArray("userlist");
+        log.info("开始解析用户列表");
+        log.info("用户列表数量：{}", jsonArray.size());
+        log.info("开始解析用户列表{}",jsonArray);
         int count = 0;
         List<String> interfaceList = new ArrayList<>();
         List<UserAssVO> assVOList =new ArrayList<>();

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/WxMagnetMapper.xml

@@ -31,13 +31,13 @@
     </sql>
 
     <select id="selectTileMagnetList" parameterType="com.dgtly.wxportal.domain.WxMagnet" resultMap="WxMagnetResult">
-    select distinct m.magnet_id, m.father_magnet, m.magnet_name, m.url, m.visible, m.magnet_size
+    select distinct m.magnet_id, m.father_magnet, m.magnet_name,m.user_type, m.url, m.visible, m.magnet_size
     , m.bg_url, m.order_num, m.create_time, m.magnet_type, m.applet_qr_url
     from wx_magnet m where  m.visible =0
     </select>
 
     <select id="selectMagnetList" parameterType="com.dgtly.wxportal.domain.WxMagnet" resultMap="WxMagnetResult">
-        select distinct m.magnet_id, m.father_magnet, m.magnet_name, m.url, m.visible, m.magnet_size
+        select distinct m.magnet_id, m.father_magnet, m.magnet_name,m.user_type, m.url, m.visible, m.magnet_size
         , m.bg_url, m.order_num, m.create_time, m.magnet_type, m.applet_qr_url
         from wx_magnet m
         <where>

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/java/com/dgtly/wxportal/controller/WxMagnetController.java

@@ -106,7 +106,7 @@ public class WxMagnetController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated WxMagnet wxMagnet)
     {
-        String newMagnetName = "";
+        String newMagnetName = wxMagnet.getMagnetName();
         String newOrderNum = "";
         if ("0".equals(wxMagnet.getUserType())){
             newMagnetName = newMagnetName + "(立邦员工)";
@@ -147,7 +147,7 @@ public class WxMagnetController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated WxMagnet wxMagnet)
     {
-        String newMagnetName = "";
+        String newMagnetName = wxMagnet.getMagnetName();
         String newOrderNum = "";
         // 根据用户类型设置磁铁名称和订单号前缀
         if ("0".equals(wxMagnet.getUserType())){