bug

src/main/java/com/yunzhi/marketing/controller/MiniAppController.java

@@ -369,6 +369,7 @@ public class MiniAppController extends BaseController {
             TaUser user = userService.getById(taPerson.getUserId());
             if (null != user) {
                 taPerson.setUserPhoto(user.getPhoto());
+                taPerson.setDescription(user.getDescription());
             }
             Map<String, Object> result = new HashMap<>();
             result.put("miniApp", miniResp);

src/main/java/com/yunzhi/marketing/controller/TaChannelController.java

@@ -89,6 +89,7 @@ public class TaChannelController extends BaseController {
     @RequestMapping(value="/admin/channel",method= RequestMethod.GET)
     public ResponseBean channelList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @RequestParam(value ="institutionId",required = false) String institutionId,
                                     @RequestParam(value ="channelId",required = false) Integer channelId,
                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -97,7 +98,7 @@ public class TaChannelController extends BaseController {
         try {
             //使用分页插件
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
-            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,getInstitutionIds(request));
+            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId,getInstitutionIds(request),institutionId);
             List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId, getInstitutionIds(request));
 
             result.getRecords().stream().forEach(e -> {
@@ -174,10 +175,6 @@ public class TaChannelController extends BaseController {
                 channelPersonLambdaQueryWrapper.eq(TaChannelPerson::getChannelId,id);
                 //查询出所有的渠道person
                 List<TaChannelPerson> list = taChannelPersonService.list(channelPersonLambdaQueryWrapper);
-                TaChannelPerson taChannelPerson = new TaChannelPerson();
-                taChannelPerson.setStatus(CommConstant.STATUS_DELETE);
-                // 把所有的渠道person 更新为删除状态
-                taChannelPersonService.update(taChannelPerson, channelPersonLambdaQueryWrapper);
 
                 // 把所有的person的type 更新为普通用户
                 list.forEach(e -> {
@@ -185,6 +182,8 @@ public class TaChannelController extends BaseController {
                     taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
                     taPersonService.updateById(taPerson);
                 });
+                // 把所有的渠道person 更新为删除状态
+                taChannelPersonService.removeByIds(list);
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");

src/main/java/com/yunzhi/marketing/controller/TaPersonController.java

@@ -576,7 +576,8 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/editPerson")
-    public ResponseBean editWxConsultant(@RequestParam(required = false)String name,@RequestParam(required = false)String avatar,@RequestParam(required = false)String phone,HttpServletRequest request) {
+    public ResponseBean editWxConsultant(@RequestParam(required = false)String name,@RequestParam(required = false)String avatar,@RequestParam(required = false)String phone,
+                                         @RequestParam(required = false)String description,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -597,6 +598,7 @@ public class TaPersonController extends BaseController {
                 TaUser user = taUserService.getById(person.getUserId());
                 user.setPhone(phone);
                 user.setLoginName(phone);
+                user.setDescription(description);
                 taUserService.updateById(user);
             }
         }

src/main/java/com/yunzhi/marketing/entity/TaPerson.java

@@ -356,4 +356,10 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private List<TaChannel> channelList;
+
+    /**
+     * 简介
+     */
+    @TableField(exist = false)
+    private String description;
 }

src/main/java/com/yunzhi/marketing/mapper/TaChannelMapper.java

@@ -44,7 +44,7 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * @param pg
      * @return
      */
-    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds);
+    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds,@Param("institutionId") String institutionId);
 
     List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId,@Param("institutionIds") List<String> institutionIds);
 

src/main/resources/mapper/TaChannelMapper.xml

@@ -32,6 +32,9 @@
             and c.org_id = #{orgId}
             and c.status = 1
 
+            <if test="institutionId != null and institutionId != ''">
+                AND c.institution_id = #{institutionId}
+            </if>
             <if test="institutionIds != null and institutionIds.size > 0">
                 AND c.institution_id in
                 <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">