Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2024-05-20 4ba262558bdd6e6d466f2ea97385dfddc52552a5

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue

@@ -303,20 +303,20 @@
  })


  let initTime = null
  nextTick(() => {
    // 加载完成之后在绑定拖动事件
    initTime = setTimeout(() => {
      columnDrop2(xGrid.value)
    }, 500)
  })

  onUnmounted(() => {
    clearTimeout(initTime)
    if (sortable2) {
      sortable2.destroy()
    }
  })
  // let initTime = null
  // nextTick(() => {
  //   // 加载完成之后在绑定拖动事件
  //   initTime = setTimeout(() => {
  //     columnDrop2(xGrid.value)
  //   }, 500)
  // })
  //
  // onUnmounted(() => {
  //   clearTimeout(initTime)
  //   if (sortable2) {
  //     sortable2.destroy()
  //   }
  // })

</script>


 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/PermissionRoleMapper.java

@@ -12,5 +12,5 @@

    Boolean saveBatch(List<PermissionRole> permissionRoles);

    List<String> getUserEditPermission(Integer loginId);
    List<String> getUserEditPermission(Integer loginId, Boolean userIsAdmin);
}

 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserRoleMapper.java

@@ -6,4 +6,5 @@

@Mapper
public interface UserRoleMapper extends BaseMapper<UserRole> {
    Boolean getUserIsAdmin(Integer id);
}

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java

@@ -8,10 +8,7 @@
import com.example.erp.entity.userInfo.PermissionBasic;
import com.example.erp.entity.userInfo.Role;
import com.example.erp.entity.userInfo.User;
import com.example.erp.mapper.userInfo.PermissionBasicMapper;
import com.example.erp.mapper.userInfo.PermissionRoleMapper;
import com.example.erp.mapper.userInfo.RoleMapper;
import com.example.erp.mapper.userInfo.UserMapper;
import com.example.erp.mapper.userInfo.*;
import com.example.erp.tools.TokenTools;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
@@ -30,13 +27,15 @@

    private final UserMapper userMapper;
    private final RoleMapper roleMapper;
    private final UserRoleMapper userRoleMapper;

   private final PermissionRoleMapper permissionRoleMapper;

    public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper) {
    public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper) {
        this.userMapper = userMapper;
        this.roleMapper = roleMapper;
        this.permissionRoleMapper = permissionRoleMapper;
        this.userRoleMapper = userRoleMapper;
    }


@@ -94,7 +93,8 @@
            userDTO.setId(user.getId());
            userDTO.setUserName(user.getUserName());
            userDTO.setToken(StpUtil.getTokenValue());
            userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId()));
            Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
            userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));
            return userDTO;
        }else{
            return null;

 north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml

@@ -28,7 +28,7 @@
                    if(d.page=null || d.page='','',concat(d.page, '.')),
                    d.permission
                ) as 'permission'
        <if test="loginId!=1">
        <if test="userIsAdmin==false">
        from user as a
                 left join user_role as e
                           on e.user_id = a.id
@@ -42,7 +42,7 @@
        where a.id = #{loginId}

        </if>
        <if test="loginId==1">
        <if test="userIsAdmin==true">
            from permission_basic d
            where d.permission='edit'
        </if>

 north-glass-erp/src/main/resources/mapper/userInfo/UserRoleMapper.xml

New file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.userInfo.UserRoleMapper">
    <select id="getUserIsAdmin">
        SELECT count(*)
        FROM user_role
        where
            user_id = #{id}
        and
            role_id = 1
    </select>
</mapper>