Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
87b7c12d
Commit
87b7c12d
authored
4 years ago
by
邓实川
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
客户管理权限设置更新
parent
e9a4251b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
171 additions
and
189 deletions
+171
-189
src/main/java/cn/timer/api/bean/qyzx/auth/QyzxAuthAccount.java
+39
-57
src/main/java/cn/timer/api/bean/qyzx/auth/QyzxAuthChild.java
+44
-64
src/main/java/cn/timer/api/controller/crm/CrmController.java
+44
-24
src/main/java/cn/timer/api/controller/qyzx/Auth.java
+10
-10
src/main/java/cn/timer/api/controller/qyzx/QyzxAuthController.java
+0
-0
src/main/java/cn/timer/api/dao/qyzx/auth/QyzxAuthAccountMapper.java
+17
-17
src/main/java/cn/timer/api/dao/qyzx/auth/QyzxAuthChildMapper.java
+17
-17
No files found.
src/main/java/cn/timer/api/bean/qyzx/auth/QyzxAuthAccount.java
View file @
87b7c12d
...
@@ -7,24 +7,6 @@
...
@@ -7,24 +7,6 @@
*/
*/
package
cn
.
timer
.
api
.
bean
.
qyzx
.
auth
;
package
cn
.
timer
.
api
.
bean
.
qyzx
.
auth
;
import
java.util.Date
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
/**
* <p>
* <p>
* Title: QyzxAuthAccount.java
* Title: QyzxAuthAccount.java
...
@@ -38,42 +20,42 @@ import lombok.NoArgsConstructor;
...
@@ -38,42 +20,42 @@ import lombok.NoArgsConstructor;
* @version 1.0
* @version 1.0
*/
*/
@Entity
//
@Entity
@Data
//
@Data
@Builder
//
@Builder
@AllArgsConstructor
//
@AllArgsConstructor
@NoArgsConstructor
//
@NoArgsConstructor
@Table
(
name
=
"qyzx_auth_account"
)
//
@Table(name = "qyzx_auth_account")
@ApiModel
(
"权限账号表"
)
//
@ApiModel("权限账号表")
public
class
QyzxAuthAccount
extends
Model
<
QyzxAuthAccount
>
{
//
public class QyzxAuthAccount extends Model<QyzxAuthAccount> {
//
private
static
final
long
serialVersionUID
=
-
7906463769401403202L
;
//
private static final long serialVersionUID = -7906463769401403202L;
//
@Id
//
@Id
@GeneratedValue
//
@GeneratedValue
@TableId
(
type
=
IdType
.
AUTO
)
//
@TableId(type = IdType.AUTO)
@ApiModelProperty
(
value
=
"主键"
,
example
=
"1"
)
//
@ApiModelProperty(value = "主键", example = "1")
private
Integer
id
;
//
private Integer id;
//
@ApiModelProperty
(
value
=
"员工id"
,
example
=
"9688"
)
//
@ApiModelProperty(value = "员工id", example = "9688")
private
Integer
empNum
;
//
private Integer empNum;
//
@ApiModelProperty
(
value
=
"企业id"
,
example
=
"117"
)
//
@ApiModelProperty(value = "企业id", example = "117")
private
Integer
orgCode
;
//
private Integer orgCode;
//
@ApiModelProperty
(
value
=
"头像url"
,
example
=
"ossUrl"
)
//
@ApiModelProperty(value = "头像url", example = "ossUrl")
private
String
headUrl
;
//
private String headUrl;
//
@ApiModelProperty
(
value
=
"姓名"
,
example
=
"tz"
)
//
@ApiModelProperty(value = "姓名", example = "tz")
private
String
name
;
//
private String name;
//
@ApiModelProperty
(
value
=
"主账号手机"
,
example
=
"18711519125"
)
//
@ApiModelProperty(value = "主账号手机", example = "18711519125")
private
String
accountPhone
;
//
private String accountPhone;
//
@ApiModelProperty
(
value
=
"子账号最大数量"
,
example
=
"10"
)
//
@ApiModelProperty(value = "子账号最大数量", example = "10")
private
Integer
maxChildAccount
;
//
private Integer maxChildAccount;
//
@ApiModelProperty
(
value
=
"创建时间"
,
example
=
"2020-05-20"
)
//
@ApiModelProperty(value = "创建时间", example = "2020-05-20")
private
Date
createdTime
;
//
private Date createdTime;
//
}
//
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/bean/qyzx/auth/QyzxAuthChild.java
View file @
87b7c12d
...
@@ -7,26 +7,6 @@
...
@@ -7,26 +7,6 @@
*/
*/
package
cn
.
timer
.
api
.
bean
.
qyzx
.
auth
;
package
cn
.
timer
.
api
.
bean
.
qyzx
.
auth
;
import
java.util.Date
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
/**
* <p>
* <p>
* Title: QyzxAuthChild.java
* Title: QyzxAuthChild.java
...
@@ -39,47 +19,47 @@ import lombok.NoArgsConstructor;
...
@@ -39,47 +19,47 @@ import lombok.NoArgsConstructor;
* @date 2020年5月19日
* @date 2020年5月19日
* @version 1.0
* @version 1.0
*/
*/
@Entity
//
@Entity
@Data
//
@Data
@Builder
//
@Builder
@AllArgsConstructor
//
@AllArgsConstructor
@NoArgsConstructor
//
@NoArgsConstructor
@Table
(
name
=
"qyzx_auth_child"
)
//
@Table(name = "qyzx_auth_child")
@ApiModel
(
"权限子账号表"
)
//
@ApiModel("权限子账号表")
public
class
QyzxAuthChild
extends
Model
<
QyzxAuthChild
>
{
//
public class QyzxAuthChild extends Model<QyzxAuthChild> {
//
private
static
final
long
serialVersionUID
=
3202868427965301934L
;
//
private static final long serialVersionUID = 3202868427965301934L;
//
@Id
//
@Id
@GeneratedValue
//
@GeneratedValue
@TableId
(
type
=
IdType
.
AUTO
)
//
@TableId(type = IdType.AUTO)
@ApiModelProperty
(
value
=
"主键"
,
example
=
"1"
)
//
@ApiModelProperty(value = "主键", example = "1")
private
Integer
id
;
//
private Integer id;
//
@ApiModelProperty
(
value
=
"员工id"
,
example
=
"9688"
)
//
@ApiModelProperty(value = "员工id", example = "9688")
private
Integer
empNum
;
//
private Integer empNum;
//
@ApiModelProperty
(
value
=
"企业id"
,
example
=
"117"
)
//
@ApiModelProperty(value = "企业id", example = "117")
private
Integer
orgCode
;
//
private Integer orgCode;
//
@ApiModelProperty
(
value
=
"是否启用"
,
example
=
"0-否 1-是"
)
//
@ApiModelProperty(value = "是否启用", example = "0-否 1-是")
private
Integer
isOpen
;
//
private Integer isOpen;
//
@ApiModelProperty
(
value
=
"是否删除"
,
example
=
"0-否 1-是"
)
//
@ApiModelProperty(value = "是否删除", example = "0-否 1-是")
private
Integer
isDel
;
//
private Integer isDel;
//
@TableField
(
fill
=
FieldFill
.
INSERT
)
//
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty
(
value
=
"创建时间"
,
example
=
"2020-05-20"
)
//
@ApiModelProperty(value = "创建时间", example = "2020-05-20")
private
Date
createdTime
;
//
private Date createdTime;
//
@ApiModelProperty
(
value
=
"创建人id"
,
example
=
"9688"
)
//
@ApiModelProperty(value = "创建人id", example = "9688")
private
Integer
createdUser
;
//
private Integer createdUser;
//
@TableField
(
fill
=
FieldFill
.
INSERT_UPDATE
)
//
@TableField(fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty
(
value
=
"修改时间"
,
example
=
"2020-05-20"
)
//
@ApiModelProperty(value = "修改时间", example = "2020-05-20")
private
Date
modifiedTime
;
//
private Date modifiedTime;
//
@ApiModelProperty
(
value
=
"修改人id"
,
example
=
"9688"
)
//
@ApiModelProperty(value = "修改人id", example = "9688")
private
Integer
modifiedUser
;
//
private Integer modifiedUser;
//
}
//
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/crm/CrmController.java
View file @
87b7c12d
/**
* Title: CrmController.java
* Description:
* @author dsc
* @date 2020年6月5日
* @version 1.0
*/
package
cn
.
timer
.
api
.
controller
.
crm
;
package
cn
.
timer
.
api
.
controller
.
crm
;
import
java.io.IOException
;
import
java.io.IOException
;
...
@@ -49,9 +42,11 @@ import cn.timer.api.bean.crm.CrmClientContacts;
...
@@ -49,9 +42,11 @@ import cn.timer.api.bean.crm.CrmClientContacts;
import
cn.timer.api.bean.crm.CrmClientData
;
import
cn.timer.api.bean.crm.CrmClientData
;
import
cn.timer.api.bean.crm.CrmClientFollow
;
import
cn.timer.api.bean.crm.CrmClientFollow
;
import
cn.timer.api.bean.crm.CrmSeaRule
;
import
cn.timer.api.bean.crm.CrmSeaRule
;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.config.enums.SysRoleType
;
import
cn.timer.api.dao.crm.CrmClientContactsMapper
;
import
cn.timer.api.dao.crm.CrmClientContactsMapper
;
import
cn.timer.api.dao.crm.CrmClientDataMapper
;
import
cn.timer.api.dao.crm.CrmClientDataMapper
;
import
cn.timer.api.dto.crm.CrmClientDataImportVo
;
import
cn.timer.api.dto.crm.CrmClientDataImportVo
;
...
@@ -221,10 +216,16 @@ public class CrmController {
...
@@ -221,10 +216,16 @@ public class CrmController {
Integer
nowEmpNum
=
getEmpNum
(
userBean
);
Integer
nowEmpNum
=
getEmpNum
(
userBean
);
Integer
orgCode
=
getOrgCode
(
userBean
);
Integer
orgCode
=
getOrgCode
(
userBean
);
YgglMainEmp
yg
=
YgglMainEmp
.
builder
().
build
()
// YgglMainEmp yg = YgglMainEmp.builder().build()
.
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
orgCode
)
// .selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, orgCode)
.
eq
(
YgglMainEmp:
:
getEmpNum
,
nowEmpNum
).
select
(
YgglMainEmp:
:
getIsManager
));
// .eq(YgglMainEmp::getEmpNum, nowEmpNum).select(YgglMainEmp::getIsManager));
if
(
yg
!=
null
&&
yg
.
getIsManager
()
!=
null
&&
(
yg
.
getIsManager
()
==
1
||
yg
.
getIsManager
()
==
2
))
{
// TODO
QyzxEmpEntAsso
qyzxEmpEntAsso
=
QyzxEmpEntAsso
.
builder
().
build
()
.
selectOne
(
new
LambdaQueryWrapper
<
QyzxEmpEntAsso
>().
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
orgCode
)
.
eq
(
QyzxEmpEntAsso:
:
getEmpNum
,
nowEmpNum
));
if
(
qyzxEmpEntAsso
!=
null
&&
qyzxEmpEntAsso
.
getUserType
()
!=
null
&&
(
qyzxEmpEntAsso
.
getUserType
()
==
SysRoleType
.
U_TYPE_ADMIN
.
getType
()
||
qyzxEmpEntAsso
.
getUserType
()
==
SysRoleType
.
U_TYPE_C_ADMIN
.
getType
()))
{
List
<
CrmBusinessGroup
>
list
=
CrmBusinessGroup
.
builder
().
build
()
List
<
CrmBusinessGroup
>
list
=
CrmBusinessGroup
.
builder
().
build
()
.
selectList
(
new
QueryWrapper
<
CrmBusinessGroup
>().
lambda
()
.
selectList
(
new
QueryWrapper
<
CrmBusinessGroup
>().
lambda
()
...
@@ -284,10 +285,16 @@ public class CrmController {
...
@@ -284,10 +285,16 @@ public class CrmController {
Integer
nowEmpNum
=
getEmpNum
(
userBean
);
Integer
nowEmpNum
=
getEmpNum
(
userBean
);
Integer
orgCode
=
getOrgCode
(
userBean
);
Integer
orgCode
=
getOrgCode
(
userBean
);
YgglMainEmp
yg
=
YgglMainEmp
.
builder
().
build
()
// YgglMainEmp yg = YgglMainEmp.builder().build()
.
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
orgCode
)
// .selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, orgCode)
.
eq
(
YgglMainEmp:
:
getEmpNum
,
nowEmpNum
).
select
(
YgglMainEmp:
:
getIsManager
));
// .eq(YgglMainEmp::getEmpNum, nowEmpNum).select(YgglMainEmp::getIsManager));
if
(
yg
!=
null
&&
yg
.
getIsManager
()
!=
null
&&
(
yg
.
getIsManager
()
==
1
||
yg
.
getIsManager
()
==
2
))
{
// if (yg != null && yg.getIsManager() != null && (yg.getIsManager() == 1 || yg.getIsManager() == 2)) {
QyzxEmpEntAsso
qyzxEmpEntAsso
=
QyzxEmpEntAsso
.
builder
().
build
()
.
selectOne
(
new
LambdaQueryWrapper
<
QyzxEmpEntAsso
>().
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
orgCode
)
.
eq
(
QyzxEmpEntAsso:
:
getEmpNum
,
nowEmpNum
));
if
(
qyzxEmpEntAsso
!=
null
&&
qyzxEmpEntAsso
.
getUserType
()
!=
null
&&
(
qyzxEmpEntAsso
.
getUserType
()
==
SysRoleType
.
U_TYPE_ADMIN
.
getType
()
||
qyzxEmpEntAsso
.
getUserType
()
==
SysRoleType
.
U_TYPE_C_ADMIN
.
getType
()))
{
List
<
CrmBusinessGroup
>
list
=
CrmBusinessGroup
.
builder
().
build
()
List
<
CrmBusinessGroup
>
list
=
CrmBusinessGroup
.
builder
().
build
()
.
selectList
(
new
LambdaQueryWrapper
<
CrmBusinessGroup
>().
eq
(
CrmBusinessGroup:
:
getOrgCode
,
orgCode
)
.
selectList
(
new
LambdaQueryWrapper
<
CrmBusinessGroup
>().
eq
(
CrmBusinessGroup:
:
getOrgCode
,
orgCode
)
.
select
(
CrmBusinessGroup:
:
getName
,
CrmBusinessGroup:
:
getId
));
.
select
(
CrmBusinessGroup:
:
getName
,
CrmBusinessGroup:
:
getId
));
...
@@ -574,11 +581,17 @@ public class CrmController {
...
@@ -574,11 +581,17 @@ public class CrmController {
Integer
empNum
=
getEmpNum
(
userBean
);
Integer
empNum
=
getEmpNum
(
userBean
);
Integer
orgCode
=
getOrgCode
(
userBean
);
Integer
orgCode
=
getOrgCode
(
userBean
);
YgglMainEmp
yg
=
YgglMainEmp
.
builder
().
build
()
// YgglMainEmp yg = YgglMainEmp.builder().build()
.
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
orgCode
)
// .selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, orgCode)
.
eq
(
YgglMainEmp:
:
getEmpNum
,
empNum
).
select
(
YgglMainEmp:
:
getIsManager
));
// .eq(YgglMainEmp::getEmpNum, empNum).select(YgglMainEmp::getIsManager));
if
(
yg
!=
null
&&
yg
.
getIsManager
()
!=
null
&&
(
yg
.
getIsManager
()
==
1
||
yg
.
getIsManager
()
==
2
))
{
// if (yg != null && yg.getIsManager() != null && (yg.getIsManager() == 1 || yg.getIsManager() == 2)) {
QyzxEmpEntAsso
qyzxEmpEntAsso
=
QyzxEmpEntAsso
.
builder
().
build
()
.
selectOne
(
new
LambdaQueryWrapper
<
QyzxEmpEntAsso
>().
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
orgCode
)
.
eq
(
QyzxEmpEntAsso:
:
getEmpNum
,
empNum
));
if
(
qyzxEmpEntAsso
!=
null
&&
qyzxEmpEntAsso
.
getUserType
()
!=
null
&&
(
qyzxEmpEntAsso
.
getUserType
()
==
SysRoleType
.
U_TYPE_ADMIN
.
getType
()
||
qyzxEmpEntAsso
.
getUserType
()
==
SysRoleType
.
U_TYPE_C_ADMIN
.
getType
()))
{
List
<
CrmClientData
>
list
=
CrmClientData
.
builder
().
build
()
List
<
CrmClientData
>
list
=
CrmClientData
.
builder
().
build
()
.
selectList
(
new
QueryWrapper
<
CrmClientData
>().
lambda
().
eq
(
CrmClientData:
:
getOrgCode
,
orgCode
)
.
selectList
(
new
QueryWrapper
<
CrmClientData
>().
lambda
().
eq
(
CrmClientData:
:
getOrgCode
,
orgCode
)
.
eq
(
CrmClientData:
:
getBelongUser
,
0
)
.
eq
(
CrmClientData:
:
getBelongUser
,
0
)
...
@@ -627,10 +640,17 @@ public class CrmController {
...
@@ -627,10 +640,17 @@ public class CrmController {
Integer
empNum
=
getEmpNum
(
userBean
);
Integer
empNum
=
getEmpNum
(
userBean
);
Integer
orgCode
=
getOrgCode
(
userBean
);
Integer
orgCode
=
getOrgCode
(
userBean
);
YgglMainEmp
yg
=
YgglMainEmp
.
builder
().
build
()
// YgglMainEmp yg = YgglMainEmp.builder().build()
.
selectOne
(
new
QueryWrapper
<
YgglMainEmp
>().
lambda
().
eq
(
YgglMainEmp:
:
getOrgCode
,
orgCode
)
// .selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, orgCode)
.
eq
(
YgglMainEmp:
:
getEmpNum
,
empNum
).
select
(
YgglMainEmp:
:
getIsManager
));
// .eq(YgglMainEmp::getEmpNum, empNum).select(YgglMainEmp::getIsManager));
if
(
yg
!=
null
&&
yg
.
getIsManager
()
!=
null
&&
(
yg
.
getIsManager
()
==
1
||
yg
.
getIsManager
()
==
2
))
{
// if (yg != null && yg.getIsManager() != null && (yg.getIsManager() == 1 || yg.getIsManager() == 2)) {
QyzxEmpEntAsso
qyzxEmpEntAsso
=
QyzxEmpEntAsso
.
builder
().
build
()
.
selectOne
(
new
LambdaQueryWrapper
<
QyzxEmpEntAsso
>().
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
orgCode
)
.
eq
(
QyzxEmpEntAsso:
:
getEmpNum
,
empNum
));
if
(
qyzxEmpEntAsso
!=
null
&&
qyzxEmpEntAsso
.
getUserType
()
!=
null
&&
(
qyzxEmpEntAsso
.
getUserType
()
==
SysRoleType
.
U_TYPE_ADMIN
.
getType
()
||
qyzxEmpEntAsso
.
getUserType
()
==
SysRoleType
.
U_TYPE_C_ADMIN
.
getType
()))
{
List
<
CrmClientData
>
datas
=
CrmClientData
.
builder
().
build
()
List
<
CrmClientData
>
datas
=
CrmClientData
.
builder
().
build
()
.
selectList
(
new
QueryWrapper
<
CrmClientData
>().
lambda
().
eq
(
CrmClientData:
:
getOrgCode
,
orgCode
)
.
selectList
(
new
QueryWrapper
<
CrmClientData
>().
lambda
().
eq
(
CrmClientData:
:
getOrgCode
,
orgCode
)
.
eq
(
groupId
!=
null
&&
groupId
>=
0
,
CrmClientData:
:
getBelongGroup
,
groupId
)
.
eq
(
groupId
!=
null
&&
groupId
>=
0
,
CrmClientData:
:
getBelongGroup
,
groupId
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/qyzx/Auth.java
View file @
87b7c12d
...
@@ -13,6 +13,7 @@ import java.util.Comparator;
...
@@ -13,6 +13,7 @@ import java.util.Comparator;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
@@ -25,7 +26,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...
@@ -25,7 +26,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
cn.timer.api.aspect.lang.annotation.Log
;
import
cn.timer.api.aspect.lang.annotation.Log
;
import
cn.timer.api.aspect.lang.enums.BusinessType
;
import
cn.timer.api.aspect.lang.enums.BusinessType
;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.QyzxEmpEntAsso
;
import
cn.timer.api.bean.qyzx.auth.QyzxAuthChild
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.bean.yggl.YgglMainEmp
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.CurrentUser
;
import
cn.timer.api.config.annotation.UserBean
;
import
cn.timer.api.config.annotation.UserBean
;
...
@@ -53,9 +53,8 @@ import io.swagger.annotations.ApiOperation;
...
@@ -53,9 +53,8 @@ import io.swagger.annotations.ApiOperation;
@Api
(
tags
=
"4.5企业中心(账号权限(新))"
)
@Api
(
tags
=
"4.5企业中心(账号权限(新))"
)
@RequestMapping
(
value
=
"/Auth"
,
produces
=
{
"application/json"
})
@RequestMapping
(
value
=
"/Auth"
,
produces
=
{
"application/json"
})
public
class
Auth
{
public
class
Auth
{
// TODO
@Value
(
"${config-8timer.register-childAccount-max-num}"
)
// @Value("${}")
private
Integer
maxNum
;
// private Integer maxNum = 10;
private
QyzxEmpEntAsso
selectMain
(
Integer
orgCode
,
Integer
empNum
)
{
private
QyzxEmpEntAsso
selectMain
(
Integer
orgCode
,
Integer
empNum
)
{
return
QyzxEmpEntAsso
.
builder
().
build
()
return
QyzxEmpEntAsso
.
builder
().
build
()
...
@@ -67,13 +66,16 @@ public class Auth {
...
@@ -67,13 +66,16 @@ public class Auth {
@PostMapping
(
value
=
"/addChildAccount"
)
@PostMapping
(
value
=
"/addChildAccount"
)
@ApiOperation
(
value
=
"新增子账号"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"新增子账号"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
@Log
(
title
=
"新增-子账号"
,
businessType
=
BusinessType
.
INSERT
)
@Log
(
title
=
"新增-子账号"
,
businessType
=
BusinessType
.
INSERT
)
public
Result
<
QyzxAuthChil
d
>
addChildAccount
(
@CurrentUser
UserBean
userBean
,
@RequestParam
Integer
childEmpNum
)
{
public
Result
<
Voi
d
>
addChildAccount
(
@CurrentUser
UserBean
userBean
,
@RequestParam
Integer
childEmpNum
)
{
Integer
orgCode
=
userBean
.
getOrgCode
();
Integer
orgCode
=
userBean
.
getOrgCode
();
Integer
empNum
=
userBean
.
getEmpNum
();
Integer
empNum
=
userBean
.
getEmpNum
();
QyzxEmpEntAsso
qyzxEmpEntAsso
=
selectMain
(
orgCode
,
empNum
);
QyzxEmpEntAsso
qyzxEmpEntAsso
=
selectMain
(
orgCode
,
empNum
);
if
(
qyzxEmpEntAsso
!=
null
)
{
if
(
qyzxEmpEntAsso
!=
null
)
{
// if ()
Integer
num
=
QyzxEmpEntAsso
.
builder
().
build
()
// return ResultUtil.error("子账号数量超过上限");
.
selectCount
(
new
LambdaQueryWrapper
<
QyzxEmpEntAsso
>().
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
orgCode
)
.
eq
(
QyzxEmpEntAsso:
:
getUserType
,
SysRoleType
.
U_TYPE_C_ADMIN
.
getType
()));
if
(
num
>=
maxNum
)
return
ResultUtil
.
error
(
"子账号数量超过上限"
);
if
(
QyzxEmpEntAsso
.
builder
().
userType
(
SysRoleType
.
U_TYPE_C_ADMIN
.
getType
()).
build
()
if
(
QyzxEmpEntAsso
.
builder
().
userType
(
SysRoleType
.
U_TYPE_C_ADMIN
.
getType
()).
build
()
.
update
(
new
LambdaQueryWrapper
<
QyzxEmpEntAsso
>().
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
orgCode
)
.
update
(
new
LambdaQueryWrapper
<
QyzxEmpEntAsso
>().
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
orgCode
)
.
eq
(
QyzxEmpEntAsso:
:
getEmpNum
,
childEmpNum
)))
.
eq
(
QyzxEmpEntAsso:
:
getEmpNum
,
childEmpNum
)))
...
@@ -85,13 +87,11 @@ public class Auth {
...
@@ -85,13 +87,11 @@ public class Auth {
@PostMapping
(
value
=
"/removeChildAccount"
)
@PostMapping
(
value
=
"/removeChildAccount"
)
@ApiOperation
(
value
=
"移除子账号"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
@ApiOperation
(
value
=
"移除子账号"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
@Log
(
title
=
"移除-子账号"
,
businessType
=
BusinessType
.
INSERT
)
@Log
(
title
=
"移除-子账号"
,
businessType
=
BusinessType
.
INSERT
)
public
Result
<
QyzxAuthChil
d
>
removeChildAccount
(
@CurrentUser
UserBean
userBean
,
@RequestParam
Integer
childEmpNum
)
{
public
Result
<
Voi
d
>
removeChildAccount
(
@CurrentUser
UserBean
userBean
,
@RequestParam
Integer
childEmpNum
)
{
Integer
orgCode
=
userBean
.
getOrgCode
();
Integer
orgCode
=
userBean
.
getOrgCode
();
Integer
empNum
=
userBean
.
getEmpNum
();
Integer
empNum
=
userBean
.
getEmpNum
();
QyzxEmpEntAsso
qyzxEmpEntAsso
=
selectMain
(
orgCode
,
empNum
);
QyzxEmpEntAsso
qyzxEmpEntAsso
=
selectMain
(
orgCode
,
empNum
);
if
(
qyzxEmpEntAsso
!=
null
)
{
if
(
qyzxEmpEntAsso
!=
null
)
{
// if ()
// return ResultUtil.error("子账号数量超过上限");
if
(
QyzxEmpEntAsso
.
builder
().
userType
(
SysRoleType
.
U_TYPE_EMP
.
getType
()).
build
()
if
(
QyzxEmpEntAsso
.
builder
().
userType
(
SysRoleType
.
U_TYPE_EMP
.
getType
()).
build
()
.
update
(
new
LambdaQueryWrapper
<
QyzxEmpEntAsso
>().
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
orgCode
)
.
update
(
new
LambdaQueryWrapper
<
QyzxEmpEntAsso
>().
eq
(
QyzxEmpEntAsso:
:
getOrgCode
,
orgCode
)
.
eq
(
QyzxEmpEntAsso:
:
getEmpNum
,
childEmpNum
)))
.
eq
(
QyzxEmpEntAsso:
:
getEmpNum
,
childEmpNum
)))
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/qyzx/QyzxAuthController.java
View file @
87b7c12d
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/qyzx/auth/QyzxAuthAccountMapper.java
View file @
87b7c12d
...
@@ -7,20 +7,20 @@
...
@@ -7,20 +7,20 @@
*/
*/
package
cn
.
timer
.
api
.
dao
.
qyzx
.
auth
;
package
cn
.
timer
.
api
.
dao
.
qyzx
.
auth
;
import
org.springframework.stereotype.Repository
;
//
import org.springframework.stereotype.Repository;
//
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
//
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//
import
cn.timer.api.bean.qyzx.auth.QyzxAuthAccount
;
//
import cn.timer.api.bean.qyzx.auth.QyzxAuthAccount;
//
/**
/
//
**
* <p>Title: QyzxAuthChildMapper.java</p>
//
* <p>Title: QyzxAuthChildMapper.java</p>
* <p>Description: </p>
//
* <p>Description: </p>
* @author dsc
//
* @author dsc
* @date 2020年5月19日
//
* @date 2020年5月19日
* @version 1.0
//
* @version 1.0
*/
//
*/
@Repository
//
@Repository
public
interface
QyzxAuthAccountMapper
extends
BaseMapper
<
QyzxAuthAccount
>{
//
public interface QyzxAuthAccountMapper extends BaseMapper<QyzxAuthAccount>{
//
}
//
}
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dao/qyzx/auth/QyzxAuthChildMapper.java
View file @
87b7c12d
...
@@ -7,20 +7,20 @@
...
@@ -7,20 +7,20 @@
*/
*/
package
cn
.
timer
.
api
.
dao
.
qyzx
.
auth
;
package
cn
.
timer
.
api
.
dao
.
qyzx
.
auth
;
import
org.springframework.stereotype.Repository
;
//
import org.springframework.stereotype.Repository;
//
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
//
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
//
import
cn.timer.api.bean.qyzx.auth.QyzxAuthChild
;
//
import cn.timer.api.bean.qyzx.auth.QyzxAuthChild;
//
/**
/
//
**
* <p>Title: QyzxAuthChildMapper.java</p>
//
* <p>Title: QyzxAuthChildMapper.java</p>
* <p>Description: </p>
//
* <p>Description: </p>
* @author dsc
//
* @author dsc
* @date 2020年5月19日
//
* @date 2020年5月19日
* @version 1.0
//
* @version 1.0
*/
//
*/
@Repository
//
@Repository
public
interface
QyzxAuthChildMapper
extends
BaseMapper
<
QyzxAuthChild
>{
//
public interface QyzxAuthChildMapper extends BaseMapper<QyzxAuthChild>{
//
}
//
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment