角色下拉排序， 作息模板 保存修改更新人和更新时间

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionRecordMapper.xml

@@ -394,6 +394,7 @@
             id=#{query.orgId}),'%'))
             )
         </if>
+        order by r.role_sort
     </select>
     <select id="selectResumptionPlan" resultType="com.xunmei.common.core.vo.IdNameVo">
         select id, plan_name as name

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysRoleServiceImpl.java

@@ -449,6 +449,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                 queryWrapper.in(SysRole::getId, conditionEto.getIds());
             }
         }
+        queryWrapper.orderByAsc(SysRole::getRoleSort);
         return roleMapper.selectList(queryWrapper).stream().map(role -> new IdName<>(role.getId(), role.getRoleName())).collect(Collectors.toList());
     }
 
@@ -462,6 +463,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("del_flag", 0);
         queryWrapper.eq("org_type", type);
+        queryWrapper.orderByAsc("role_sort");
         return baseMapper.selectList(queryWrapper);
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -16,6 +16,7 @@ import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.core.utils.snowId.DateHelper;
 import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
 import com.xunmei.system.domain.SysWorkTimeSetDayofweek;
@@ -316,10 +317,13 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
                     if (org != null) {
                         set.setOrgName(org.getShortName());
                     }
-
+                    set.setCreateTime(new Date());
+                    set.setCreateBy(SecurityUtils.getUsername());
                     sysWorkTimeSetMapper.insert(set);
 
                 } else {
+                    set.setUpdateTime(new Date());
+                    set.setUpdateBy(SecurityUtils.getUsername());
                     sysWorkTimeSetMapper.updateById(set);
                 }
 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -75,6 +75,7 @@
 
     <select id="selectRoleAll" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
+        order by r.role_sort
     </select>
 
     <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
@@ -94,11 +95,13 @@
     <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
         WHERE r.del_flag = '0' and u.username = #{userName}
+        order by r.role_sort
     </select>
 
     <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
         where r.role_name=#{roleName} and r.del_flag = '0' limit 1
+        order by r.role_sort
     </select>
 
     <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">