xiaoning
/
yoga-app-manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修正

Browse Source
pull/1/head
董哲奇 2 weeks ago
parent d54eb56aed
commit 6a8a813d7c
12 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File

12
ruoyi-admin/pom.xml
Unescape View File

@ -168,6 +168,18 @@
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

2
ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockGoodsProperty.java
Unescape View File

@ -33,7 +33,7 @@ public class StockGoodsProperty implements Serializable {
/**
* 属性code
*/
@TableId(value = "property_code", type = IdType.INPUT)
@TableField(value = "property_code")
private String propertyCode;
/**

2
ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysRoleMapper.xml
Unescape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.xluobo.business.sys.admin.repo.mapper.ISysRoleMapper">
<select id="selectUserRoleList" resultType="cn.xluobo.business.sys.admin.repo.model.SysRole">
<select id="selectUserRoleList" resultType="com.ruoyi.common.core.domain.entity.SysRole">
select * from sys_role a
where a.delete_flag='0'
and exists(select 1 from sys_user_role b where a.role_id=b.role_id and b.user_id=#{userId} and b.tenant_id=#{tenantId} )

23
ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysTenantMapper.xml
Unescape View File

@ -1,23 +0,0 @@
<?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="cn.xluobo.business.sys.admin.repo.mapper.SysTenantMapper">
<select id="selectUserTenantList" resultType="cn.xluobo.business.sys.admin.repo.model.SysTenant">
select t.tenant_id,t.tenant_name
from sys_tenant t,sys_user_tenant ut
where t.delete_flag='0'
and t.tenant_id=ut.tenant_id and ut.user_id=#{userId}
<if test="limitTenantUserId != null and limitTenantUserId != ''">
and exists(select 1 from sys_user_tenant utl where utl.user_id=#{limitTenantUserId} and utl.tenant_id=t.tenant_id)
</if>
order by t.create_time desc
</select>
<select id="selectInUseUserTenant" resultType="cn.xluobo.business.sys.admin.repo.model.SysTenant">
select * from sys_tenant t,sys_user_tenant ut
where t.tenant_id=ut.tenant_id
and ut.user_id=#{userId} and ut.tenant_id=#{tenantId}
and now() between t.begin_time and t.end_time
and t.in_use='1'
and t.delete_flag='0'
</select>
</mapper>

2
ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysUserMapper.xml
Unescape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.xluobo.business.sys.admin.repo.mapper.ISysUserMapper">
<select id="selectUserList" resultType="cn.xluobo.business.sys.admin.repo.model.SysUser">
<select id="selectUserList" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select user_id,username,name,u.phone,email_address,enable,locked,account_expired,pwd_expired,u.dept_id,d.dept_name,
(select group_concat(t.tenant_name) from sys_tenant t,sys_user_tenant ut where ut.user_id=u.user_id and t.tenant_id=ut.tenant_id) as tenant_names
from sys_user u left join sys_dept d on u.dept_id=d.dept_id

2
ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/mapper/WechatCpAccountMapper.java
Unescape View File

@ -2,6 +2,7 @@ package cn.xluobo.business.wechat.cp.repo.mapper;
import cn.xluobo.business.wechat.cp.repo.model.WechatCpAccount;
import com.baomidou.mybatisplus.annotation.SqlParser;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -14,6 +15,7 @@ import java.util.List;
* @author zhangby
* @since 2024-01-23 06:59:58
*/
@Mapper
public interface WechatCpAccountMapper extends com.baomidou.mybatisplus.core.mapper.BaseMapper<WechatCpAccount> {
@SqlParser(filter = true)

2
ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpContactFollow.java
Unescape View File

@ -35,7 +35,7 @@ public class WechatCpContactFollow implements Serializable {
/**
* 添加了此外部联系人的企业成员userid
*/
@TableId(value = "cp_user_id", type = IdType.INPUT)
@TableField(value = "cp_user_id")
private String cpUserId;
/**

2
ruoyi-admin/src/main/java/cn/xluobo/config/mybatis/MybatisConfiguration.java
Unescape View File

@ -20,7 +20,7 @@ import java.util.List;
@EnableTransactionManagement
@Configuration
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
@MapperScan(value = {"cn.xluobo.*.*.*.repo.mapper"})
//@MapperScan(value = {"cn.xluobo.*.*.*.repo.mapper"})
public class MybatisConfiguration {
/**

2
ruoyi-admin/src/main/java/cn/xluobo/config/wechat/cp/WechatCpConfiguration.java
Unescape View File

@ -23,7 +23,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
@Configuration
//@Configuration
public class WechatCpConfiguration {
@Autowired

2
ruoyi-admin/src/main/resources/application.yml
Unescape View File

@ -127,7 +127,7 @@ mybatis-plus:
# 搜索指定包别名
typeAliasesPackage: com.cyl.**.domain, com.ruoyi.common.core.domain.entity, com.ruoyi.**.domain
# 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:cn/xluobo/business/**/**/repo/mapping/**.xml
# 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml
global-config:

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java
Unescape View File

@ -17,7 +17,7 @@ import java.util.TimeZone;
// 表示通过aop框架暴露该代理对象,AopContext能够访问
@EnableAspectJAutoProxy(exposeProxy = true)
// 指定要扫描的Mapper类的包的路径
@MapperScan({"com.ruoyi.**.mapper", "com.fjp.**.mapper", "com.cyl.**.mapper"})
@MapperScan({"com.ruoyi.**.mapper", "com.fjp.**.mapper", "com.cyl.**.mapper","cn.xluobo.*.*.*.repo.mapper"})
public class ApplicationConfig
{
/**

10
ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java
Unescape View File

@ -11,7 +11,7 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisService;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.OssUtils;
//import com.ruoyi.common.utils.OssUtils;
import com.ruoyi.system.service.ISysConfigService;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
@ -27,8 +27,8 @@ import java.util.stream.Collectors;
@RequestMapping
public class H5CommonController {
@Autowired
private OssUtils ossUtils;
// @Autowired
// private OssUtils ossUtils;
@Autowired
private AddressMapper addressMapper;
@Autowired
@ -97,8 +97,8 @@ public class H5CommonController {
@PostMapping("/h5/file/upload")
public AjaxResult uploadFile(MultipartFile file) {
String url = ossUtils.uploadOneFile(file);
return AjaxResult.successData(url);
// String url = ossUtils.uploadOneFile(file);
return AjaxResult.successData(null);
}
@GetMapping("/no-auth/config/get")

Write Preview
Loading…
Cancel
Save