dcs пре 6 месеци
родитељ
комит
d5693de640

+ 1 - 0
virgo.core/src/main/resources/mapper/MgrOrganizationProjectMapper.xml

@@ -66,6 +66,7 @@
     <update id="cancel" parameterType="com.bosshand.virgo.core.model.MgrOrganizationProject">
         UPDATE mgr_organization_project
         <trim prefix="set" suffixOverrides=",">
+            <if test="userId==0">userId=#{userId},</if>
             <if test="clientId==0">clientId=#{clientId},</if>
             <if test="agentId==0">agentId=#{agentId},</if>
             <if test="merchantId==0">merchantId=#{merchantId},</if>

+ 5 - 2
virgo.manager/src/main/java/com/bosshand/virgo/service/ClientService.java

@@ -2,6 +2,7 @@ package com.bosshand.virgo.service;
 
 import com.bosshand.virgo.core.dao.MgrClientDao;
 import com.bosshand.virgo.core.model.MgrClient;
+import com.bosshand.virgo.core.utils.StringUtil;
 import com.bosshand.virgo.message.service.ApiClient;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -39,8 +40,10 @@ public class ClientService {
 
     public MgrClient get(long id) {
         MgrClient mgrClient = clientDao.get(id);
-        Map<Long, String> roomIds = apiClient.getRoomIds(mgrClient.getFirsTimeRoom());
-        mgrClient.setRoomMap(roomIds);
+        if (StringUtil.notBlank(mgrClient.getFirsTimeRoom())) {
+            Map<Long, String> roomIds = apiClient.getRoomIds(mgrClient.getFirsTimeRoom());
+            mgrClient.setRoomMap(roomIds);
+        }
         return mgrClient;
     }