提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -188,7 +188,11 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setUpdateDate(new Date());
         user.setStatus("1");
         user.setAcceptAgreementStatus("1");
-        user.setUserName(user.getUserName());
+        user.setUserName(user.getLoginName());
+        String userName = jsonObject.getString("userName");
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(userName)) {
+            user.setUserName(userName);
+        }
         user.setRemark("这是系统自动注册!");
         user.setVerifyStatus("0");
         user.setFaceStatus("0");
@@ -251,8 +255,9 @@ public class TaUserServiceImpl implements ITaUserService {
              * 这个 审核id 很重要，后面的角色，都是根据这个 审核id 查询的，
              * 登陆成功后这个 审核id 会存 session
              */
-
-            return checkHouse(response, taUserVO, userVerify);
+            ResponseBean responseBean = checkHouse(response, taUserVO, userVerify);
+            responseBean.setUrl(responseBean.getUrl() + "&token=" + token);
+            return responseBean;
         } else if (taUserVerifies.size() >= 2) {
             response.addSuccess(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode())  + "&token=" + token);
             return response;

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxLoginServiceImpl.java

@@ -211,9 +211,7 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		ResponseBean response = new ResponseBean();
 
 		JSONObject jsonObject = JSONObject.parseObject(parameter);
-		String userName = jsonObject.getString("userName");
 		TaUser user = jsonObject.toJavaObject(TaUser.class);
-		user.setUserName(userName);
 
 		Map<String,Object> map = Maps.newHashMap();
 		map.put("loginName",user.getLoginName());
@@ -234,6 +232,10 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		user.setStatus("1");
 		user.setAcceptAgreementStatus("1");
 		user.setUserName(user.getLoginName());
+		String userName = jsonObject.getString("userName");
+		if (StringUtils.isNotBlank(userName)) {
+			user.setUserName(userName);
+		}
 		user.setRemark("这是系统自动注册!");
 		user.setVerifyStatus("0");
 		user.setFaceStatus("0");

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -845,11 +845,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         ResponseBean responseBean = new ResponseBean();
         ids.stream().forEach(e->{
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
+            QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
+            buildingOwnerInfoQueryWrapper.eq("ta_user_verify_id", e);
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(buildingOwnerInfoQueryWrapper);
             if (null != tpBuildingOwnerInfo) {
-                taUserVerifyMapper.deleteById(tpBuildingOwnerInfo.getTaUserVerifyId());
+                tpBuildingOwnerInfoMapper.deleteById(tpBuildingOwnerInfo.getId());
             }
-            tpBuildingOwnerInfoMapper.deleteById(e);
+            taUserVerifyMapper.deleteById(e);
         });
 
         responseBean.addSuccess("操作成功!");

CODE/smart-community/property-api/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml

@@ -60,53 +60,52 @@
 
     <select id="selectListByParams" resultType="com.community.huiju.model.TpBuildingOwnerInfo">
         SELECT
-            t.id,
-            t.phase_name,
-            t.building_name,
-            t.unit_name,
-            t.level_name,
-            t.room_no_name,
-            u.id as userVerifyId,
-            t.community_id as communityId,
-            t.owner_tel as ownerTel,
-            t.owner_name as ownerName,
-            t.id_card as idCard,
-            r.description as roleName,
-            u.verify_status as verifyStatus,
-            m.user_name AS updateName,
-            t.create_date as createDate
+            u.id,
+            u.phase_name,
+            u.building_name,
+            u.unit_name,
+            u.level_name,
+            u.room_no_name,
+            u.id AS userVerifyId,
+            u.community_id AS communityId,
+            t.login_name AS ownerTel,
+            t.user_name AS ownerName,
+            t.id_card AS idCard,
+            r.description AS roleName,
+            u.verify_status AS verifyStatus,
+            u.verify_name AS updateName,
+            u.create_date AS createDate
         FROM
-            tp_building_owner_info t
-            INNER JOIN ta_user_verify u ON t.ta_user_verify_id = u.id
+            ta_user_verify u
+            LEFT JOIN ta_user t ON t.id = u.user_id
             LEFT JOIN ta_sys_role r ON u.role_id = r.id
-            LEFT JOIN tp_user m ON t.create_user = m.id
         WHERE
 
-        t.community_id=#{tpBuildingOwnerInfo.communityId,jdbcType=INTEGER}
+        u.community_id=#{tpBuildingOwnerInfo.communityId,jdbcType=INTEGER}
         <if test="tpBuildingOwnerInfo.phaseId != null and tpBuildingOwnerInfo.phaseId != ''">
-            and t.phase_id = #{tpBuildingOwnerInfo.phaseId,jdbcType=INTEGER}
+            and u.phase_id = #{tpBuildingOwnerInfo.phaseId,jdbcType=INTEGER}
         </if>
         <if test="tpBuildingOwnerInfo.buildingId != null and tpBuildingOwnerInfo.buildingId != ''">
-            and t.building_id = #{tpBuildingOwnerInfo.buildingId,jdbcType=INTEGER}
+            and u.building_id = #{tpBuildingOwnerInfo.buildingId,jdbcType=INTEGER}
         </if>
         <if test="tpBuildingOwnerInfo.unitId != null and tpBuildingOwnerInfo.unitId != ''">
-            and t.unit_id = #{tpBuildingOwnerInfo.unitId,jdbcType=INTEGER}
+            and u.unit_id = #{tpBuildingOwnerInfo.unitId,jdbcType=INTEGER}
         </if>
         <if test="tpBuildingOwnerInfo.levelId != null and tpBuildingOwnerInfo.levelId != ''">
-            and t.level_id = #{tpBuildingOwnerInfo.levelId,jdbcType=INTEGER}
+            and u.level_id = #{tpBuildingOwnerInfo.levelId,jdbcType=INTEGER}
         </if>
         <if test="tpBuildingOwnerInfo.roomNoId != null and tpBuildingOwnerInfo.roomNoId != ''">
-            and t.room_no_id = #{tpBuildingOwnerInfo.roomNoId,jdbcType=INTEGER}
+            and u.room_no_id = #{tpBuildingOwnerInfo.roomNoId,jdbcType=INTEGER}
         </if>
         <if test="tpBuildingOwnerInfo.ownerName != null and tpBuildingOwnerInfo.ownerName != ''">
-            and t.owner_name like concat('%',#{tpBuildingOwnerInfo.ownerName,jdbcType=VARCHAR},'%')
+            and t.user_name like concat('%',#{tpBuildingOwnerInfo.ownerName,jdbcType=VARCHAR},'%')
         </if>
         <if test="tpBuildingOwnerInfo.ownerTel != null and tpBuildingOwnerInfo.ownerTel != ''">
-            and t.owner_tel like concat('%',#{tpBuildingOwnerInfo.ownerTel,jdbcType=VARCHAR},'%')
+            and t.login_name like concat('%',#{tpBuildingOwnerInfo.ownerTel,jdbcType=VARCHAR},'%')
         </if>
         <if test="tpBuildingOwnerInfo.idCard != null and tpBuildingOwnerInfo.idCard != ''">
             and t.id_card like concat('%',#{tpBuildingOwnerInfo.idCard,jdbcType=VARCHAR},'%')
         </if>
-        order by t.update_date desc
+        order by u.create_date desc
     </select>
 </mapper>