Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/utils/CzrkUtils.java

@@ -247,8 +247,8 @@ public class CzrkUtils {
                                 }
                             }
                         } else if ("village".equals(roleKey)) {
-                            String village = czrk.getVillage();
-                            if (StringUtils.isNotBlank(village) && village.equals(areaId)) {
+                            String villageId = czrk.getVillageId();
+                            if (StringUtils.isNotBlank(villageId) && villageId.equals(areaId)) {
                                 flag = false;
                                 break;
                             } else {

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -1104,7 +1104,7 @@
             <if test="isConfirm != null  and isConfirm != ''">and is_confirm = #{isConfirm}</if>
             <if test="isDel != null  and isDel != ''">and is_del = #{isDel}</if>
         </where>
-        order by create_time DESC
+        order by chang_user_time DESC
     </select>
     <select id="selectCzrkListByDeptId" resultMap="CzrkResult">
         select id, dept_id, create_time, is_del from czrk