Merge branch 'v3' into v3.5

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

         try{
 
             // TODO 目前如果是公客，就取当前操作人员的 buildingId
-            if ("public".equals(customerType)) {
-                Map<String,Object> map = JWTUtils.getUserIdAndOrgId(request);
-                String userId = (String) map.get("userId");
-                QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("user_id", userId);
-                queryWrapper.orderByDesc("create_date");
-                queryWrapper.last("limit 1");
-                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
-                buildingId = personBuilding.getBuildingId();
-            }
+//            if ("public".equals(customerType)) {
+//                Map<String,Object> map = JWTUtils.getUserIdAndOrgId(request);
+//                String userId = (String) map.get("userId");
+//                QueryWrapper<TaPersonBuilding> queryWrapper = new QueryWrapper<>();
+//                queryWrapper.eq("user_id", userId);
+//                queryWrapper.orderByDesc("create_date");
+//                queryWrapper.last("limit 1");
+//                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
+//                buildingId = personBuilding.getBuildingId();
+//            }
             return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

             building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
         }
         building.setCreateDate(LocalDateTime.now());
-        building.setStatus(0);
+        building.setStatus(2);
         building.setOrgId(orgId);
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

             queryWrapper.eq("building_id",building);
         }
         queryWrapper.eq(orgId != null, "org_id", orgId);
+        queryWrapper.orderByDesc("create_date");
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
         return taPersonMapper.selectPage(page,queryWrapper);
     }

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

     public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId){
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
+
+            /**
+             * <if test="buildingId != null">
+             *             ,(select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{buildingId} and tspf.is_first_time = 1) as sharePersonName
+             *         </if>
+             */
+
+            /**
+             * SELECT
+             *         b.*
+             *         FROM
+             *         ta_person b
+             *         <where>
+             *             b.status > 0
+             *             AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+             *             <if test="name != null and name !=''">
+             *                 and b.nickname like CONCAT('%',#{name}, '%')
+             *             </if>
+             *             <if test="tel != null and tel!=''">
+             *                 and b.phone like CONCAT('%',#{tel}, '%')
+             *             </if>
+             *             <if test="entryType != null and entryType !=''">
+             *                 and b.entry_type = #{entryType}
+             *             </if>
+             *             <if test="sex != null and sex !=''">
+             *                 and b.sex = #{sex}
+             *             </if>
+             *             <if test="orgId != null">
+             *                 and b.org_id = #{orgId}
+             *             </if>
+             *             <if test="consultTel != null and consultTel !=''">
+             *                 and b.tel like CONCAT('%',#{consultTel}, '%')
+             *             </if>
+             *             and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+             *         </where>
+             *         order by b.create_date desc
+             */
+
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
             return taRecommendCustomerMapper.getPublicCustomerList(page, building,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);

src/main/resources/mapper/TaBuildingMapper.xml

                 and  ta_building.org_id = #{orgId}
             </if>
         </where>
-        ORDER BY create_date DESC
+        ORDER BY create_date DESC,status asc
     </select>
 
     <select id="buildingAll" resultType="com.huiju.estateagents.entity.TaBuilding">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

 
     <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-        b.*,
-        (select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{buildingId} and tspf.is_first_time = 1) as sharePersonName
+        b.*
         FROM
         ta_person b
         <where>