luowei 1 anno fa
parent
commit
92223442b5

+ 1 - 1
soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysAreaServiceImpl.java

@@ -164,7 +164,7 @@ public class SysAreaServiceImpl extends ServiceImpl<ISysAreaMapper, SysArea> imp
         queryWrapper.eq("name", sysArea.getName());
         queryWrapper.eq("del_flag", 0);
         SysArea sysArea1 = baseMapper.selectOne(queryWrapper);
-        if (null != sysArea1 && sysArea1.getId() != sysArea.getId()) {
+        if (null != sysArea1 && !sysArea1.getId().equals(sysArea.getId())) {
             throw new ServiceException("名称不能重复");
         }
         sysArea.setUpdateTime(DateUtils.getNowDate());

+ 1 - 1
soc-modules/soc-modules-system/src/main/resources/mapper/system/SysAreaCheckMapper.xml

@@ -80,7 +80,7 @@
         <if test="sysAreaCheck.orgType !=null">
             and org_type=#{sysAreaCheck.orgType}
         </if>
-
+        ORDER BY create_time desc
     </select>