Merge branch 'master_admin0117' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionChangeRecordBiz.java

@@ -16,6 +16,7 @@ import tk.mybatis.mapper.entity.Example;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Transactional
 @Service("appUserPositionChangeRecordBiz")
@@ -43,26 +44,26 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public void addPositionChangeRecord(AppUserPositionTemp userPositionTemp, AppUserPositionTemp oldData, Integer operatorId, Timestamp relTime) {
         AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
 
-        if (!(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
+        if (Objects.nonNull(userPositionTemp.getIsQuit()) && !(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
             appUserPositionChangeRecord.setJobRemark(USER_LEAVE_COMPANT);
         }
 
         //状态1：职位变动
-        if (!(userPositionTemp.getJobId().equals(oldData.getJobId()))) {
+        if (Objects.nonNull(userPositionTemp.getJobId()) && !(userPositionTemp.getJobId().equals(oldData.getJobId()))) {
             appUserPositionChangeRecord.setOldJobId(oldData.getJobId());
             appUserPositionChangeRecord.setNewJobId(userPositionTemp.getJobId());
             appUserPositionChangeRecord.setJobRemark(JOB_CHANGE);
             findUserJobName(appUserPositionChangeRecord);
         }
         //状态2：身份变动
-        if (!(userPositionTemp.getPositionId().equals(oldData.getPositionId()))) {
+        if (Objects.nonNull(userPositionTemp.getPositionId()) && !(userPositionTemp.getPositionId().equals(oldData.getPositionId()))) {
             appUserPositionChangeRecord.setOldPositionId(oldData.getPositionId());
             appUserPositionChangeRecord.setNewPositionId(userPositionTemp.getPositionId());
             appUserPositionChangeRecord.setJobRemark(POSITION_CHANGE);
             findUserPositionName(appUserPositionChangeRecord);
         }
         //状态3：公司变动调整
-        if (!(userPositionTemp.getCompanyId().equals(oldData.getCompanyId()))) {
+        if (Objects.nonNull(userPositionTemp.getCompanyId()) && !(userPositionTemp.getCompanyId().equals(oldData.getCompanyId()))) {
             appUserPositionChangeRecord.setOldCompanyId(oldData.getCompanyId());
             appUserPositionChangeRecord.setOldCompanyName(oldData.getCompanyName());
             appUserPositionChangeRecord.setNewCompanyId(userPositionTemp.getCompanyId());
@@ -76,7 +77,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
         appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
         appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
         appUserPositionChangeRecord.setOperatorId(operatorId);
-        mapper.insert(appUserPositionChangeRecord);
+        mapper.insertSelective(appUserPositionChangeRecord);
     }
 
     /**

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -258,6 +258,9 @@ public class AppPermissionService {
         if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(mobilecode)) {
             return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
+        if (StringUtils.isNotBlank(username)){
+            return JsonResultUtil.createFailedResult(ResultCode.FAILED_CODE, "服务升级中，暂不支持注册");
+        }
         if (StringUtils.isNotBlank(code)){
             //判断处理活动关键字
             String[] codes = code.split("_");
@@ -1048,6 +1051,9 @@ public class AppPermissionService {
         if (StringUtils.isBlank(username) || StringUtils.isBlank(password)) {
             return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
+        if (StringUtils.isNotBlank(username)){
+            return JsonResultUtil.createFailedResult(ResultCode.FAILED_CODE, "服务升级中，暂不支持注册");
+        }
         // 是否已存在
         AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
         if (null != user) {

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -110,7 +110,7 @@
 	pl.username AS superiorMobileNumber
     FROM
 	app_user_login l
-    LEFT JOIN app_user_detail d ON d.userid = l.id
+    LEFT JOIN   app_user_detail  d ON d.userid = l.id
     LEFT JOIN app_user_login ul ON ul.id = d.inviter_account
     LEFT JOIN base_user_member m ON d.userid = m.user_id
     LEFT JOIN
@@ -137,6 +137,8 @@
     LEFT JOIN app_user_login pl ON r.parent_id = pl.id
     LEFT JOIN app_user_detail pd ON pl.id = pd.userid
     WHERE
+    d.channel>0
+    and
 	l.id = #{userId}
     </select>
 
@@ -185,9 +187,11 @@
         is_del = 0
         ) r ON l.id = r.user_id
         LEFT JOIN app_user_login pl ON r.parent_id = pl.id
-        LEFT JOIN app_user_detail pd ON pl.id = pd.userid
+        LEFT JOIN app_user_detail  pd ON pl.id = pd.userid
         WHERE
         l.isdel = 0
+        and
+        d.channel>0
         <if test="mobile !=null and mobile !='' ">
             and l.username like CONCAT('%',#{mobile},'%')
         </if>

ace-modules/ace-admin/src/main/resources/mapper/MyWaterMapper.xml

@@ -63,8 +63,8 @@ FROM
 	INNER JOIN ( SELECT `id`, `username` FROM `app_user_login` <if test="phone != null and phone != ''">
      WHERE `username`=#{phone}
 </if> ) AS `aul` ON aul.id = w.user_id
-	INNER JOIN ( SELECT `userid`, `nickname`, `realname` FROM `app_user_detail` <if test="username != null and username != ''">
+	INNER JOIN ( SELECT `userid`, `nickname`, `realname`,channel FROM `app_user_detail` <if test="username != null and username != ''">
     WHERE nickname =#{username}  OR realname =#{username}
-</if> ) AS `aud` ON aud.userid = aul.id ORDER BY `totalAmount` DESC
+</if> ) AS `aud` ON aud.userid = aul.id where aud.channel >0 ORDER BY `totalAmount` DESC
 </select>
 </mapper>
\ No newline at end of file