Merge branch 'lcy' of http://47.107.53.207:3000/traineeCoder001/Bailian-Al

benyun-core/src/main/java/com/benyun/core/controller/WorkTableController.java

@@ -87,6 +87,8 @@ public class WorkTableController {
         int flag = attentionPoolService.turnBusinessOpportunities(turnVo, userId);
         if (flag == 1)
             return R.ok("转化成功！");
+        if (flag == 2)
+            return R.ok("已转化。");
         return R.fail("转化失败。");
     }
 

benyun-core/src/main/java/com/benyun/core/service/impl/AttentionPoolServiceImpl.java

@@ -69,6 +69,10 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
         AttentionPool pool = attentionPoolDao.searchByAttentionIdAndUserId(turnVo.getAttentionId(), userId);
         if (pool == null)
             return 0;
+        BusinessOpportunitiesClue businessOpportunitiesClue = businessOpportunitiesDao.searchByClueIdOrAttentionIdAndUserId(null, turnVo.getAttentionId(), userId);
+        if (businessOpportunitiesClue != null){
+            return 2;
+        }
         BusinessOpportunitiesClue clue = new BusinessOpportunitiesClue();
         clue.setClueId(UUID.randomUUID().toString().replace("-",""));
         clue.setAttentionId(turnVo.getAttentionId());

benyun-core/src/main/java/com/benyun/core/service/impl/BusinessOpportunitiesServiceImpl.java

@@ -67,6 +67,8 @@ public class BusinessOpportunitiesServiceImpl implements BusinessOpportunitiesSe
 
     @Override
     public int addFollow(AddFollowRecordVo addVo, String userId) {
+        if (addVo.getClueId() == null || addVo.getClueId().equals(""))
+            return 0;
         BusinessOpportunitiesClue clue = businessOpportunitiesDao.searchByClueIdOrAttentionIdAndUserId(addVo.getClueId(),null, userId);
         if (clue == null)
             return 0;

benyun-core/src/main/resources/mapper/BrandZoneMapper.xml

@@ -54,9 +54,11 @@
         FROM
             `bl_brand_zone_distribution`
         <where>
-            <foreach collection="addrCodes" item="addrCode" open="addr_code IN (" separator="," close=")">
-                #{addrCode,jdbcType=VARCHAR}
-            </foreach>
+            <if test="addrCodes != null">
+                <foreach collection="addrCodes" item="addrCode" open="addr_code IN (" separator="," close=")">
+                    #{addrCode,jdbcType=VARCHAR}
+                </foreach>
+            </if>
         </where>
         GROUP BY
             addr_code;