Merge branch 'system-165' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -85,39 +85,36 @@ public class TokenController {
         sysUser.setSysPerson(sysPerson);
 
         if(StringUtils.isNotEmpty(form.getType())){
+            Long userId = userInfo.getUserId();
+            int count = userMapper.selectMbUserCount(userId);
             String type = form.getType();
             if(type.equals("app")){   //app登录
                 //插入或更新mce_mbuser消息中心_移动端注册表表记录cids，通过userId去这个表中查询，有记录则更新对应的cids，没有就插入
                 String cids = form.getCids();
-                Long userId = userInfo.getUserId();
-                int count = userMapper.selectMbUserCount(userId);
                 if(count > 0){
-                    userMapper.updateMbUser(userId,cids, userInfo.getUserName());
+                    userMapper.updateMbUser(null,null,userId,cids, userInfo.getUserName());
                 }else{
                     userMapper.insertMbUser(userId,cids, userInfo.getUserName());
                 }
-            }
-            if(type.equals("wx")){
+            }else if(type.equals("wx")){
                 String phone = form.getPhone();
-                LambdaQueryWrapper<MceMbuser> queryWrapper = Wrappers.lambdaQuery();
-                queryWrapper.eq(MceMbuser::getPhone,phone);
-                List<MceMbuser> list = mceMbuserService.list(queryWrapper);
-                if(CollectionUtils.isEmpty(list)){
+                String openId = request.getParameter("openId");
+                if(count > 0){
+                    userMapper.updateMbUser(phone,openId,userId,null, userInfo.getUserName());
+                }else {
                     MceMbuser one = new MceMbuser();
                     one.setPhone(phone);
-                    one.setOpenid(request.getSession().getAttribute("openid").toString());
-                    one.setCreateBy(SecurityUtils.getUsername());
-                    one.setUserId(SecurityUtils.getUserId());
+                    if((openId != null) && (StringUtils.isNotBlank(openId))){
+                        one.setOpenid(openId);
+                    }
+                    one.setCreateBy(userInfo.getUserName());
+                    one.setUserId(userInfo.getUserId());
                     one.setCreateTime(LocalDateTime.now());
 
                     if(!mceMbuserService.save(one)){
                         throw new BusinessException("注册失败，重新注册");
                     }
-                }else {
-                    request.getSession().setAttribute("openid",list.get(0).getOpenid());
                 }
-
-                request.getSession().setAttribute("phone",phone);
             }
         }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -169,5 +169,5 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
 
     public void insertMbUser(@Param("userId") Long userId,@Param("cids") String cids,@Param("createBy") String createBy);
 
-    public void updateMbUser(@Param("userId") Long userId,@Param("cids") String cids,@Param("updateBy") String updateBy);
+    public void updateMbUser(@Param("phone") String phone,@Param("openId") String openId,@Param("userId") Long userId,@Param("cids") String cids,@Param("updateBy") String updateBy);
 }

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -345,6 +345,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 
 	<update id="updateMbUser">
-		update mce_mbuser set cids = #{cids},update_by=#{updateBy},update_time=sysdate() where user_id = #{userId}
+		update mce_mbuser
+		<set>
+			<if test="phone != null and phone != ''">phone = #{phone},</if>
+			<if test="openId != null and openId != ''">openid = #{openId},</if>
+			<if test="cids != null and cids != ''">cids = #{cids},</if>
+			update_by=#{updateBy},
+			update_time=sysdate()
+		</set>
+		where user_id = #{userId}
 	</update>
 </mapper>