合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/CommunityServiceImpl.java

@@ -41,7 +41,9 @@ public class CommunityServiceImpl implements CommunityServiceI {
 
 	@Autowired
 	private TpEquipmentTreeMapper tpEquipmentTreeMapper;
-	
+
+	@Autowired
+	private TaUserMapper taUserMapper;
 	/**
 	 * 分页获取小区列表
 	 * @param toCommunities
@@ -68,7 +70,18 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		if (size < 1){
 			return 0;
 		}
-	 
+
+
+		//时维护ta_user（发帖需要）
+		TaUser taUser= new TaUser();
+		taUser.setLoginName(toCommunities.getLoginName());
+		taUser.setCreateDate(new Date());
+		taUser.setUserName(toCommunities.getUserName());
+		taUser.setStatus("1");
+		taUserMapper.insert(taUser);
+
+
+
 		//构建用户信息
 		TpUser tpUser = new TpUser();
 		tpUser.setUserName(toCommunities.getUserName());
@@ -77,6 +90,7 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		tpUser.setCreateUser(1);
 		tpUser.setCommunityId(toCommunities.getId());
 		tpUser.setStatus(Constant.EFFECTIVE);
+		tpUser.setTaUserId(taUser.getId());
 		//插入用户信息
 		tpUserMapper.insertSelective(tpUser);
 		//维护此用户的角色

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -180,7 +180,7 @@ public class ToUserServerImpl implements IToUserService {
     @Override
     public ResponseBean addUser(String parameter,Integer userID,Integer communityId) {
         ResponseBean response= new ResponseBean<>();
-        JSONObject object= JSONObject.parseObject(parameter);
+         JSONObject object= JSONObject.parseObject(parameter);
         ToUser toUser= new ToUser();
 
         String loginName= object.getString("loginName");
@@ -214,27 +214,6 @@ public class ToUserServerImpl implements IToUserService {
             toSysUserRole.setRoleId(roleID);
             toSysUserRoleMapper.insert(toSysUserRole);
         }
-
-        //时维护ta_user（发帖需要）
-        TaUser taUser= new TaUser();
-        taUser.setLoginName(loginName);
-        taUser.setCreateUser(userID);
-        taUser.setCreateDate(new Date());
-        taUser .setUserName(userName);
-        taUser .setStatus("1");
-
-        taUserMapper.insert(taUser);
-        TpUser tpUser= new TpUser();
-        tpUser.setTaUserId(taUser.getId());
-        tpUser.setUserName(userName);
-        tpUser.setLoginName(loginName);
-        tpUser.setRemark(remark);
-        tpUser.setStatus("1");
-
-        tpUser.setCreateUser(userID);
-        tpUser.setCreateDate(new Date());
-        tpUser.setCommunityId(communityId);
-        tpUserMapper.insertSelective(tpUser);
          response.addSuccess("成功");
         return response;
     }

CODE/smart-community/operate-api/src/main/resources/mapper/TaUserMapper.xml

@@ -44,7 +44,7 @@
     delete from ta_user
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
+  <insert id="insert" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
     insert into ta_user (id, community_id, building_owner_info_id,
       head_portrait, user_name, login_name,
       login_password, email, gender,
@@ -60,7 +60,7 @@
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
       #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR},
-      #{idCard,jdbcType=VARCHAR}, #{openid,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR},
+      #{idCard,jdbcType=VARCHAR}, #{openid,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
@@ -142,9 +142,6 @@
       <if test="nickname != null" >
         nickname,
       </if>
-      <if test="taUserId != null" >
-        ta_user_id,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >

CODE/smart-community/operate-api/src/main/resources/mapper/TpUserMapper.xml

@@ -15,6 +15,7 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="ta_user_id" property="taUserId" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, user_name, login_name, login_password, status, remark, email, head_portrait, 
@@ -84,6 +85,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="taUserId != null" >
+        ta_user_id
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -125,6 +129,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER}
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpUser" >

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

@@ -241,7 +241,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 //                        String codeUrl= imageServiceI.getImageUrl(inputStream);
 
                         TdImages tdImages= new TdImages();
-                        tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId());
+                        tdImages.setImageUrl(qrCodePerproties.getUrl() + tpActivity.getId()+"&codeState=1");
                         tdImages.setUuid(tpActivity.getId());
                         tdImages.setType("activityCode");
                         tdImages.setCreateUser(userElement.getId());

CODE/smart-community/property-api/src/main/resources/application.yml

@@ -14,4 +14,4 @@ mybatis-plus:
 
 # 二维码生成地址
 qr-code:
-  url: https://www.baidu.com/?id=
+  url: http://ycapi.jcjyhn.com/#/forum/sign?id=

VUECODE/smart-property-manage/src/views/social/signUp/index.vue

@@ -41,7 +41,7 @@
         label="角色"
         show-overflow-tooltip
         align="center">
-        <!--<template slot-scope="scope">{{ getRoleName(scope.row.roleName) }}</template>-->
+        <template slot-scope="scope">{{ getRoleName(scope.row.roleName) }}</template>
       </el-table-column>
       <el-table-column
         prop="address"