Просмотр исходного кода

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

anderx лет назад: 7
Родитель
Сommit
78a816007c

+ 2 - 2
src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java

@@ -223,8 +223,8 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 		jtBusinessCategoryMapper.updateByPrimaryKeySelective(category);
 		//是否修改了模块类别
 		boolean moduleChange = null != jtBusinessCategory.getModule() ? !jtBusinessCategory.getModule().equals(jtBusinessCategory.getNextModule()) : false;
-		//是否有上级id
-		boolean existSuperId = StringUtils.isNotBlank(jtBusinessCategory.getSuperId());
+		//是否有上级id,并且改变了上级id
+		boolean existSuperId = StringUtils.isNotBlank(jtBusinessCategory.getSuperId()) ? !jtBusinessCategory.getSuperId().equals(jtBusinessCategory.getOldSuperId()) : false;
 		//获得更改前的自己的number
 		String oldNumber = jtBusinessCategoryMapper.selectByPrimaryKey(jtBusinessCategory.getId()).getNumber();
 		String number = null;

+ 2 - 2
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -1376,7 +1376,7 @@ from
 	from user_identity i 
 	inner join user u on i.uid = u.id
 	left join industry_category c on c.id = i.industry
-	where 1 = 1
+	where u.source = 0
 	<if test="auditStatus != null ">
 	and  i.audit_status = #{auditStatus,jdbcType=VARCHAR}
 	</if>
@@ -1402,7 +1402,7 @@ from
 	count(0)
 	from user_identity i 
 	inner join user u on i.uid = u.id
-	where 1 = 1
+	where u.source = 0 
 	<if test="auditStatus != null ">
 	and  i.audit_status = #{auditStatus,jdbcType=VARCHAR}
 	</if>