机构

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -463,11 +463,11 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                                     // 单品
                                     if ("1".equals(promotion.getType())) {
                                         // 优惠价
-                                        if ("1".equals(promotion.getMode())) {
+                                        /*if ("1".equals(promotion.getMode())) {
                                             // 单品优惠价取当前sku的优惠价
                                             Double touchPrice=productDao.getTouchPriceBySku(orderProduct.getSkuId());
                                             shopReducedPrice += (orderProduct.getPrice() - touchPrice) * orderProduct.getNum();
-                                        }
+                                        }*/
                                         // 单品满减
                                         if ("2".equals(promotion.getMode())) {
                                             if (orderProduct.getPrice() * orderProduct.getNum() > promotion.getTouchPrice()) {
@@ -2763,7 +2763,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     public String productDataVerification(Integer orderID,String firstClubType) {
         String mes = "";
         List<NewOrderProduct> productList = newOrderProductDao.findListProductOrderID(orderID);
-        if ("1".equals(firstClubType)) {
+        if (!"1".equals(firstClubType)) {
             for (NewOrderProduct product : productList) {
                 if (product.getMachineType() == 3) {
                     mes = "发货商品中存在械字号三类商品，机构资质不符合，确定发货吗？";

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -431,7 +431,6 @@ public class NewOrderController extends BaseController {
             List<NewOrderProduct> orderProductList = Lists.newArrayList();
             for (NewOrderProduct newOrderProduct : newOrder.getOrderProduct()) {
                 if (StringUtils.isNotEmpty(newOrderProduct.getEnabledStatus())) {
-//                    NewOrderProduct o = (NewOrderProduct) JsonMapper.fromJsonString(newOrderProduct.getEnabledStatus(), NewOrderProduct.class);
                     NewOrderProduct o = JSONObject.parseObject(newOrderProduct.getEnabledStatus(), NewOrderProduct.class);
                     JSONObject jsonObject = JSONObject.parseObject(newOrderProduct.getEnabledStatus());
                     String productId = jsonObject.getString("productId");
@@ -467,6 +466,27 @@ public class NewOrderController extends BaseController {
                         skuId = newOrderProductDao.findSkuIdByProductId(o.getProductID());
                     }
                     o.setSplitCode(productDao.getSplitCodeByProductId(o.getProductID()));
+                    o.setPreferential(0d);
+                    o.setDiscount(100d);
+                    o.setDiscountFee(0d);
+                    o.setTotalAmount(0d);
+                    o.setShouldPayFee(0d);
+                    o.setSingleShouldPayTotalTax(0d);
+                    o.setShouldPayTotalTax(0d);
+                    o.setCmFee(0d);
+                    o.setTotalFee(0d);
+                    o.setTotalAddedValueTax(0d);
+                    o.setAddedValueTax(0d);
+                    o.setTaxRate(0d);
+                    o.setPresentNum(0);
+                    o.setNotOutStore(o.getNum());
+                    o.setStatus(0);//订单商品待付款
+                    if (o.getPayStatus() == null) {
+                        o.setPayStatus("0"); //默认值为未付款(0 未进账 1 待财务审核 2 已进账)
+                    }
+
+                    Integer promotionsId = o.getPromotionsId() != null ? o.getPromotionsId() : 0;
+                    o.setPromotionsId(promotionsId);
                     if ("0".equals(productType)) {
                         o.setSkuId(Integer.valueOf(skuId));
                         o.setPreferential((o.getPrice() - o.getDiscountPrice()) * o.getNum());//折扣
@@ -477,36 +497,27 @@ public class NewOrderController extends BaseController {
                             o.setSingleShouldPayTotalTax(o.getAddedValueTax());
                             o.setShouldPayTotalTax(o.getTotalAddedValueTax());
                         }
+
+                        orderProductList.add(o);
+                        String productCategory = o.getProductCategory();
+                        if (StringUtils.equals(productCategory, "2")) {
+                            isSecondHandOrder = true;
+                        }
                     } else {
                         if (null == o.getSkuId()) {
+                            List<Integer> skuIdByPromotionsId = productDao.findSkuIdByPromotionsId(o.getPromotionsId());
+
                             //赠品
-                            o.setSkuId(productDao.findSkuIdByPromotionsId(o.getPromotionsId()));
+                            for (Integer sku : skuIdByPromotionsId) {
+                                o.setSkuId(sku);
+
+                                orderProductList.add(o);
+                                String productCategory = o.getProductCategory();
+                                if (StringUtils.equals(productCategory, "2")) {
+                                    isSecondHandOrder = true;
+                                }
+                            }
                         }
-                        o.setPreferential(0d);
-                        o.setDiscount(100d);
-                        o.setDiscountFee(0d);
-                        o.setTotalAmount(0d);
-                        o.setShouldPayFee(0d);
-                        o.setSingleShouldPayTotalTax(0d);
-                        o.setShouldPayTotalTax(0d);
-                        o.setCmFee(0d);
-                        o.setTotalFee(0d);
-                        o.setTotalAddedValueTax(0d);
-                        o.setAddedValueTax(0d);
-                        o.setTaxRate(0d);
-                    }
-                    o.setPresentNum(0);
-                    o.setNotOutStore(o.getNum());
-                    o.setStatus(0);//订单商品待付款
-                    if (o.getPayStatus() == null) {
-                        o.setPayStatus("0"); //默认值为未付款(0 未进账 1 待财务审核 2 已进账)
-                    }
-                    Integer promotionsId = o.getPromotionsId() != null ? o.getPromotionsId() : 0;
-                    o.setPromotionsId(promotionsId);
-                    orderProductList.add(o);
-                    String productCategory = o.getProductCategory();
-                    if (StringUtils.equals(productCategory, "2")) {
-                        isSecondHandOrder = true;
                     }
                 }
             }

src/main/java/com/caimei/modules/product/dao/ProductDao.java

@@ -218,7 +218,7 @@ public interface ProductDao extends CrudDao<Product> {
 
     CmSku findSkuById(Integer skuId);
 
-    Integer findSkuIdByPromotionsId(Integer promotionsId);
+    List<Integer> findSkuIdByPromotionsId(Integer promotionsId);
 
     void deleteProductSkus(@Param("skuIds")List<Integer> skuIds,@Param("productId")Integer productId);
 

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -421,196 +421,239 @@ public class AgencyController extends BaseController {
         logger.info("cmClubinfo数据库数据"+cmClubinfos);
        //编辑时添加操作日志
         if(newCmClubs!=null) {
-            if (StringUtils.isBlank(cmClubinfos.getHighestAchievement()) || null == cmClubinfos.getReachPepole() || null == cmClubinfos.getClinchPepole()) {
-                if (!"".equals(cmClubinfo.getHighestAchievement())  || cmClubinfo.getReachPepole() != null || cmClubinfo.getClinchPepole() != null) {
-                    list.add("新增了活动业绩信息");
-                    type = 1;
-                }
-
-            } else {
-                if (StringUtils.isNotBlank(cmClubinfo.getHighestAchievement())) {
-                    if (!cmClubinfo.getHighestAchievement().equals(cmClubinfos.getHighestAchievement())) {
-                        list.add("修改了活动业绩的最高业绩信息");
+            if (cmClubinfos != null) {
+                if (StringUtils.isBlank(cmClubinfos.getHighestAchievement()) || null == cmClubinfos.getReachPepole() || null == cmClubinfos.getClinchPepole()) {
+                    if (!"".equals(cmClubinfo.getHighestAchievement()) || cmClubinfo.getReachPepole() != null || cmClubinfo.getClinchPepole() != null) {
+                        list.add("新增了活动业绩信息");
                         type = 1;
                     }
+
                 } else {
-                    list.add("删除了活动业绩的最高业绩信息");
-                    type = 1;
-                }
+                    if (StringUtils.isNotBlank(cmClubinfo.getHighestAchievement())) {
+                        if (!cmClubinfo.getHighestAchievement().equals(cmClubinfos.getHighestAchievement())) {
+                            list.add("修改了活动业绩的最高业绩信息");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了活动业绩的最高业绩信息");
+                        type = 1;
+                    }
 
-                if (cmClubinfo.getReachPepole() != null) {
-                    if (!cmClubinfo.getReachPepole().equals(cmClubinfos.getReachPepole())) {
-                        list.add("修改了活动业绩的到店人数信息");
+                    if (cmClubinfo.getReachPepole() != null) {
+                        if (!cmClubinfo.getReachPepole().equals(cmClubinfos.getReachPepole())) {
+                            list.add("修改了活动业绩的到店人数信息");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了活动业绩的到店人数信息");
                         type = 1;
                     }
-                } else {
-                    list.add("删除了活动业绩的到店人数信息");
-                    type = 1;
-                }
 
-                if (cmClubinfo.getClinchPepole() != null) {
-                    if (!cmClubinfo.getClinchPepole().equals(cmClubinfos.getClinchPepole())) {
-                        list.add("修改了活动业绩的成交人数信息");
+                    if (cmClubinfo.getClinchPepole() != null) {
+                        if (!cmClubinfo.getClinchPepole().equals(cmClubinfos.getClinchPepole())) {
+                            list.add("修改了活动业绩的成交人数信息");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了活动业绩的成交人数信息");
                         type = 1;
                     }
-                } else {
-                    list.add("删除了活动业绩的成交人数信息");
-                    type = 1;
                 }
-            }
 
 
-            if (cmClubinfos.getConsumeA() == null || cmClubinfos.getConsumeB() == null || cmClubinfos.getConsumeC() == null) {
-                if (cmClubinfo.getConsumeA() != null || cmClubinfo.getConsumeB() != null || cmClubinfo.getConsumeC() != null) {
-                    list.add("新增了会员消费金额信息");
-                    type = 1;
-                }
-            } else {
-                if (cmClubinfo.getConsumeA() != null) {
-                    if (!cmClubinfo.getConsumeA().equals(cmClubinfos.getConsumeA())) {
-                        list.add("修改了A类会员消费金额");
+                if (cmClubinfos.getConsumeA() == null || cmClubinfos.getConsumeB() == null || cmClubinfos.getConsumeC() == null) {
+                    if (cmClubinfo.getConsumeA() != null || cmClubinfo.getConsumeB() != null || cmClubinfo.getConsumeC() != null) {
+                        list.add("新增了会员消费金额信息");
                         type = 1;
                     }
                 } else {
-                    list.add("删除了A类会员消费金额");
-                    type = 1;
-                }
-                if (cmClubinfo.getConsumeB() != null) {
-                    if (!cmClubinfo.getConsumeB().equals(cmClubinfos.getConsumeB())) {
-                        list.add("修改了B类会员消费金额");
+                    if (cmClubinfo.getConsumeA() != null) {
+                        if (!cmClubinfo.getConsumeA().equals(cmClubinfos.getConsumeA())) {
+                            list.add("修改了A类会员消费金额");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了A类会员消费金额");
                         type = 1;
                     }
-                } else {
-                    list.add("删除了B类会员消费金额");
-                    type = 1;
-                }
-                if (cmClubinfo.getConsumeC() != null) {
-                    if (!cmClubinfo.getConsumeC().equals(cmClubinfos.getConsumeC())) {
-                        list.add("修改了C类会员消费金额");
+                    if (cmClubinfo.getConsumeB() != null) {
+                        if (!cmClubinfo.getConsumeB().equals(cmClubinfos.getConsumeB())) {
+                            list.add("修改了B类会员消费金额");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了B类会员消费金额");
+                        type = 1;
+                    }
+                    if (cmClubinfo.getConsumeC() != null) {
+                        if (!cmClubinfo.getConsumeC().equals(cmClubinfos.getConsumeC())) {
+                            list.add("修改了C类会员消费金额");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了C类会员消费金额");
                         type = 1;
                     }
-                } else {
-                    list.add("删除了C类会员消费金额");
-                    type = 1;
                 }
-            }
 
 
-            if (cmClubinfos.getCateA() == null || cmClubinfos.getCateB() == null || cmClubinfos.getCateC() == null) {
-                if (null != cmClubinfo.getCateA() || null != cmClubinfo.getCateB() || null != cmClubinfo.getCateC()) {
-                    list.add("新增了会员信息");
-                    type = 1;
-                }
-            } else {
-                if (cmClubinfo.getCateA() != null) {
-                    if (!cmClubinfo.getCateA().equals(cmClubinfos.getCateA())) {
-                        list.add("修改了A会员信息");
+                if (cmClubinfos.getCateA() == null || cmClubinfos.getCateB() == null || cmClubinfos.getCateC() == null) {
+                    if (null != cmClubinfo.getCateA() || null != cmClubinfo.getCateB() || null != cmClubinfo.getCateC()) {
+                        list.add("新增了会员信息");
                         type = 1;
                     }
                 } else {
-                    list.add("删除了A会员信息");
-                    type = 1;
-                }
+                    if (cmClubinfo.getCateA() != null) {
+                        if (!cmClubinfo.getCateA().equals(cmClubinfos.getCateA())) {
+                            list.add("修改了A会员信息");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了A会员信息");
+                        type = 1;
+                    }
 
-                if (cmClubinfo.getCateB() != null) {
-                    if (!cmClubinfo.getCateB().equals(cmClubinfos.getCateB())) {
-                        list.add("修改了B会员信息");
+                    if (cmClubinfo.getCateB() != null) {
+                        if (!cmClubinfo.getCateB().equals(cmClubinfos.getCateB())) {
+                            list.add("修改了B会员信息");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了B会员信息");
                         type = 1;
                     }
-                } else {
-                    list.add("删除了B会员信息");
-                    type = 1;
-                }
 
-                if (cmClubinfo.getCateC() != null) {
-                    if (!cmClubinfo.getCateC().equals(cmClubinfos.getCateC())) {
-                        list.add("修改了C会员信息");
+                    if (cmClubinfo.getCateC() != null) {
+                        if (!cmClubinfo.getCateC().equals(cmClubinfos.getCateC())) {
+                            list.add("修改了C会员信息");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了C会员信息");
                         type = 1;
                     }
-                } else {
-                    list.add("删除了C会员信息");
-                    type = 1;
                 }
-            }
 
 
-            if ("".equals(cmClubinfos.getMonthAchievement()) || "".equals(cmClubinfos.getPromotionAchievement()) || "".equals(cmClubinfos.getYearAchievement())) {
-                if (!"".equals(cmClubinfos.getMonthAchievement()) || !"".equals(cmClubinfos.getPromotionAchievement()) || !"".equals(cmClubinfos.getYearAchievement())) {
-                    list.add("新增了业绩信息");
-                    type = 1;
-                }
-
-            } else {
-                if (cmClubinfo.getMonthAchievement() != null) {
-                    if (!cmClubinfo.getMonthAchievement().equals(cmClubinfos.getMonthAchievement())) {
-                        list.add("修改了月业绩信息");
+                if ("".equals(cmClubinfos.getMonthAchievement()) || "".equals(cmClubinfos.getPromotionAchievement()) || "".equals(cmClubinfos.getYearAchievement())) {
+                    if (StringUtils.isNotBlank(cmClubinfo.getMonthAchievement()) || StringUtils.isNotBlank(cmClubinfo.getPromotionAchievement()) || StringUtils.isNotBlank(cmClubinfo.getYearAchievement())) {
+                        list.add("新增了业绩信息");
                         type = 1;
                     }
+
                 } else {
-                    list.add("删除了月业绩信息");
-                    type = 1;
-                }
+                    if (cmClubinfo.getMonthAchievement() != null) {
+                        if (!cmClubinfo.getMonthAchievement().equals(cmClubinfos.getMonthAchievement())) {
+                            list.add("修改了月业绩信息");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了月业绩信息");
+                        type = 1;
+                    }
 
-                if (cmClubinfo.getPromotionAchievement() != null) {
-                    if (!cmClubinfo.getPromotionAchievement().equals(cmClubinfos.getPromotionAchievement())) {
-                        list.add("修改了促销业绩信息");
+                    if (cmClubinfo.getPromotionAchievement() != null) {
+                        if (!cmClubinfo.getPromotionAchievement().equals(cmClubinfos.getPromotionAchievement())) {
+                            list.add("修改了促销业绩信息");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了促销业绩信息");
                         type = 1;
                     }
-                } else {
-                    list.add("删除了促销业绩信息");
-                    type = 1;
-                }
 
-                if (cmClubinfo.getYearAchievement() != null) {
-                    if (!cmClubinfo.getYearAchievement().equals(cmClubinfos.getYearAchievement())) {
-                        list.add("修改了年业绩信息");
+                    if (cmClubinfo.getYearAchievement() != null) {
+                        if (!cmClubinfo.getYearAchievement().equals(cmClubinfos.getYearAchievement())) {
+                            list.add("修改了年业绩信息");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了年业绩信息");
                         type = 1;
                     }
-                } else {
-                    list.add("删除了年业绩信息");
-                    type = 1;
                 }
-            }
 
 
-            if (cmClubinfos.getArea() == null || cmClubinfos.getBedNums() == null || cmClubinfos.getBeauticians() == null) {
-                if (null != cmClubinfo.getArea() || null != cmClubinfo.getBedNums() || null != cmClubinfo.getBeauticians()) {
-                    list.add("更新了基本信息");
-                    type = 1;
-                }
-            } else {
-                if (cmClubinfo.getArea() != null) {
-                    if (!cmClubinfo.getArea().equals(cmClubinfos.getArea())) {
-                        list.add("修改了机构面积");
+                if (cmClubinfos.getArea() == null || cmClubinfos.getBedNums() == null || cmClubinfos.getBeauticians() == null) {
+                    if (null != cmClubinfo.getArea() || null != cmClubinfo.getBedNums() || null != cmClubinfo.getBeauticians()) {
+                        list.add("更新了基本信息");
                         type = 1;
                     }
                 } else {
-                    list.add("删除了机构面积");
-                    type = 1;
-                }
+                    if (cmClubinfo.getArea() != null) {
+                        if (!cmClubinfo.getArea().equals(cmClubinfos.getArea())) {
+                            list.add("修改了机构面积");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了机构面积");
+                        type = 1;
+                    }
 
-                if (cmClubinfo.getBedNums() != null) {
-                    if (!cmClubinfo.getBedNums().equals(cmClubinfos.getBedNums())) {
-                        list.add("修改了美容床数");
+                    if (cmClubinfo.getBedNums() != null) {
+                        if (!cmClubinfo.getBedNums().equals(cmClubinfos.getBedNums())) {
+                            list.add("修改了美容床数");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了美容床数");
+                        type = 1;
+                    }
+
+                    if (cmClubinfo.getBeauticians() != null) {
+                        if (!cmClubinfo.getBeauticians().equals(cmClubinfos.getBeauticians())) {
+                            list.add("修改了美容师数");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了美容师数");
                         type = 1;
                     }
-                } else {
-                    list.add("删除了美容床数");
-                    type = 1;
                 }
 
-                if (cmClubinfo.getBeauticians() != null) {
-                    if (!cmClubinfo.getBeauticians().equals(cmClubinfos.getBeauticians())) {
-                        list.add("修改了美容师数");
+                if (cmClubinfos.getEmpnum() != null) {
+                    if (cmClubinfo.getEmpnum() != null) {
+                        if (!cmClubinfo.getEmpnum().equals(cmClubinfos.getEmpnum())) {
+                            list.add("修改了公司人数");
+                            type = 1;
+                        }
+                    } else {
+                        list.add("删除了公司人数");
                         type = 1;
                     }
                 } else {
-                    list.add("删除了美容师数");
+                    if (cmClubinfo.getEmpnum() != null) {
+                        list.add("新增了公司人数");
+                        type = 1;
+                    }
+                }
+            } else {
+                if (StringUtils.isNotBlank(cmClubinfo.getHighestAchievement()) || cmClubinfo.getReachPepole() != null || cmClubinfo.getClinchPepole() != null) {
+                    list.add("新增了活动业绩信息");
+                    type = 1;
+                }
+                if (cmClubinfo.getConsumeA() != null || cmClubinfo.getConsumeB() != null || cmClubinfo.getConsumeC() != null) {
+                    list.add("新增了会员消费金额信息");
+                    type = 1;
+                }
+                if (null != cmClubinfo.getCateA() || null != cmClubinfo.getCateB() || null != cmClubinfo.getCateC()) {
+                    list.add("新增了会员信息");
+                    type = 1;
+                }
+                if (StringUtils.isNotBlank(cmClubinfo.getMonthAchievement()) || StringUtils.isNotBlank(cmClubinfo.getPromotionAchievement()) || StringUtils.isNotBlank(cmClubinfo.getYearAchievement())) {
+                    list.add("新增了业绩信息");
+                    type = 1;
+                }
+                if (null != cmClubinfo.getArea() || null != cmClubinfo.getBedNums() || null != cmClubinfo.getBeauticians()) {
+                    list.add("更新了基本信息");
+                    type = 1;
+                }
+                if (cmClubinfo.getEmpnum() != null) {
+                    list.add("新增了公司人数");
                     type = 1;
                 }
             }
 
-
             if (StringUtils.isNotBlank(newCmClubs.getInfo())) {
                 if (StringUtils.isNotBlank(cmClubinfo.getInfo())) {
                     if (!cmClubinfo.getInfo().equals(newCmClubs.getInfo())) {
@@ -629,22 +672,6 @@ public class AgencyController extends BaseController {
             }
 
 
-            if (cmClubinfos.getEmpnum() != null) {
-                if (cmClubinfo.getEmpnum() != null) {
-                    if (!cmClubinfo.getEmpnum().equals(cmClubinfos.getEmpnum())) {
-                        list.add("修改了公司人数");
-                        type = 1;
-                    }
-                } else {
-                    list.add("删除了公司人数");
-                    type = 1;
-                }
-            } else {
-                if (cmClubinfo.getEmpnum() != null) {
-                    list.add("新增了公司人数");
-                    type = 1;
-                }
-            }
             if (StringUtils.isNotBlank(newCmClubs.getFax())) {
                 if (StringUtils.isNotBlank(cmClubinfo.getFax())) {
                     if (!cmClubinfo.getFax().equals(newCmClubs.getFax())) {

src/main/webapp/WEB-INF/views/modules/user/behaviorRecordList.jsp

@@ -31,6 +31,9 @@
             color: #0d0d0d;
             text-decoration: underline;
         }
+        .a_class {
+            text-decoration: underline;
+        }
     </style>
 </head>
 <body>
@@ -139,10 +142,20 @@
             </c:if>
             <c:if test="${cmBehaviorRecord.userID != '0'}">
                <td>
-                   ${cmBehaviorRecord.corporateName}
+                   <c:if test="${cmBehaviorRecord.companyType eq 2}">
+                       <a class="a_class" href="${ctx}/new/user/agency/clubPortrait?clubID=${cmBehaviorRecord.clubID}&clubName=${cmBehaviorRecord.corporateName}&dateType=0&type=4">${cmBehaviorRecord.corporateName}</a>
+                   </c:if>
+                   <c:if test="${cmBehaviorRecord.companyType ne 2}">
+                       ${cmBehaviorRecord.corporateName}
+                   </c:if>
                </td>
                <td>
-                   ${cmBehaviorRecord.contacts}
+                   <c:if test="${cmBehaviorRecord.companyType eq 2}">
+                       <a class="a_class" href="${ctx}/new/user/agency/clubPortrait?clubID=${cmBehaviorRecord.clubID}&clubName=${cmBehaviorRecord.corporateName}&dateType=0&type=4">${cmBehaviorRecord.contacts}</a>
+                   </c:if>
+                   <c:if test="${cmBehaviorRecord.companyType ne 2}">
+                       ${cmBehaviorRecord.contacts}
+                   </c:if>
                </td>
                <td>
                    ${cmBehaviorRecord.phoneNumber}

src/main/webapp/WEB-INF/views/modules/user/behaviorRecordRossList.jsp

@@ -31,6 +31,9 @@
             color: #0d0d0d;
             text-decoration: underline;
         }
+        .a_class {
+            text-decoration: underline;
+        }
     </style>
 </head>
 <body>
@@ -140,10 +143,20 @@
             </c:if>
             <c:if test="${cmBehaviorRecord.userID != '0'}">
                 <td>
+                    <c:if test="${cmBehaviorRecord.companyType eq 2}">
+                        <a class="a_class" href="${ctx}/new/user/agency/clubPortrait?clubID=${cmBehaviorRecord.clubID}&clubName=${cmBehaviorRecord.corporateName}&dateType=0&type=4">${cmBehaviorRecord.corporateName}</a>
+                    </c:if>
+                    <c:if test="${cmBehaviorRecord.companyType ne 2}">
                         ${cmBehaviorRecord.corporateName}
+                    </c:if>
                 </td>
                 <td>
+                    <c:if test="${cmBehaviorRecord.companyType eq 2}">
+                        <a class="a_class" href="${ctx}/new/user/agency/clubPortrait?clubID=${cmBehaviorRecord.clubID}&clubName=${cmBehaviorRecord.corporateName}&dateType=0&type=4">${cmBehaviorRecord.contacts}</a>
+                    </c:if>
+                    <c:if test="${cmBehaviorRecord.companyType ne 2}">
                         ${cmBehaviorRecord.contacts}
+                    </c:if>
                 </td>
                 <td>
                         ${cmBehaviorRecord.phoneNumber}