Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
de1b1a34
Commit
de1b1a34
authored
Jan 22, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-含风险项目商险不购买申请提交
parent
0e38684e
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
11 deletions
+11
-11
UpmsDaprUtils.java
...fu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java
+2
-2
TInsuranceUnpurchaseApplyServiceImpl.java
...ry/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
+2
-2
UserController.java
...u/cloud/plus/v1/yifu/admin/controller/UserController.java
+2
-2
SysUserMapper.java
...m/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserMapper.java
+1
-1
SysUserService.java
...yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java
+1
-1
SysUserServiceImpl.java
...d/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
+2
-2
SysUserMapper.xml
...yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+1
-1
No files found.
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java
View file @
de1b1a34
...
@@ -126,7 +126,7 @@ public class UpmsDaprUtils {
...
@@ -126,7 +126,7 @@ public class UpmsDaprUtils {
* @Param
* @Param
* @return
* @return
**/
**/
public
R
<
Boolean
>
selectExitDeptCompany
(
String
dept
Name
)
{
public
R
<
Boolean
>
selectExitDeptCompany
(
String
dept
Id
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprUpmsProperties
.
getAppUrl
(),
daprUpmsProperties
.
getAppId
(),
"/user/inner/selectExitDeptCompany"
,
dept
Name
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
return
HttpDaprUtil
.
invokeMethodPost
(
daprUpmsProperties
.
getAppUrl
(),
daprUpmsProperties
.
getAppId
(),
"/user/inner/selectExitDeptCompany"
,
dept
Id
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
View file @
de1b1a34
...
@@ -416,9 +416,9 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
...
@@ -416,9 +416,9 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
//申请人是否属于子分公司和该项目是否有审批通过记录赋值
//申请人是否属于子分公司和该项目是否有审批通过记录赋值
private
void
setValue
(
TInsuranceUnpurchaseApply
tInsuranceUnpurchaseApply
,
YifuUser
user
)
{
private
void
setValue
(
TInsuranceUnpurchaseApply
tInsuranceUnpurchaseApply
,
YifuUser
user
)
{
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getDeptNo
()))
{
if
(
Common
.
isNotNull
(
tInsuranceUnpurchaseApply
.
getDeptNo
()))
{
String
dept
Name
=
user
.
getDeptName
();
String
dept
Id
=
user
.
getDeptId
().
toString
();
R
<
Boolean
>
booleanR
=
upmsDaprUtils
.
selectExitDeptCompany
(
dept
Name
);
R
<
Boolean
>
booleanR
=
upmsDaprUtils
.
selectExitDeptCompany
(
dept
Id
);
if
(
Common
.
isEmpty
(
booleanR
)
||
Boolean
.
FALSE
.
equals
(
booleanR
.
getData
()))
{
if
(
Common
.
isEmpty
(
booleanR
)
||
Boolean
.
FALSE
.
equals
(
booleanR
.
getData
()))
{
tInsuranceUnpurchaseApply
.
setCompanyFlag
(
CommonConstants
.
ONE_STRING
);
tInsuranceUnpurchaseApply
.
setCompanyFlag
(
CommonConstants
.
ONE_STRING
);
}
else
{
}
else
{
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java
View file @
de1b1a34
...
@@ -620,7 +620,7 @@ public class UserController {
...
@@ -620,7 +620,7 @@ public class UserController {
@Inner
@Inner
@PostMapping
(
value
=
{
"/inner/selectExitDeptCompany"
})
@PostMapping
(
value
=
{
"/inner/selectExitDeptCompany"
})
public
Boolean
selectExitDeptCompany
(
@RequestBody
String
dept
Name
)
{
public
Boolean
selectExitDeptCompany
(
@RequestBody
String
dept
Id
)
{
return
userService
.
selectExitDeptCompany
(
dept
Name
);
return
userService
.
selectExitDeptCompany
(
dept
Id
);
}
}
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/mapper/SysUserMapper.java
View file @
de1b1a34
...
@@ -82,5 +82,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
...
@@ -82,5 +82,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
List
<
SysUser
>
getUserManagerByUpDepartIdUp
(
@Param
(
"departId"
)
Integer
departId
,
@Param
(
"roleId"
)
String
roleId
);
List
<
SysUser
>
getUserManagerByUpDepartIdUp
(
@Param
(
"departId"
)
Integer
departId
,
@Param
(
"roleId"
)
String
roleId
);
String
selectExitDeptCompany
(
@Param
(
"dept
Name"
)
String
deptName
);
String
selectExitDeptCompany
(
@Param
(
"dept
Id"
)
String
deptId
);
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserService.java
View file @
de1b1a34
...
@@ -190,6 +190,6 @@ public interface SysUserService extends IService<SysUser> {
...
@@ -190,6 +190,6 @@ public interface SysUserService extends IService<SysUser> {
List
<
SysUser
>
getUserManagerByUpDepartIdUp
(
Integer
departId
,
String
roleId
);
List
<
SysUser
>
getUserManagerByUpDepartIdUp
(
Integer
departId
,
String
roleId
);
Boolean
selectExitDeptCompany
(
String
dept
Name
);
Boolean
selectExitDeptCompany
(
String
dept
Id
);
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java
View file @
de1b1a34
...
@@ -953,8 +953,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
...
@@ -953,8 +953,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
}
@Override
@Override
public
Boolean
selectExitDeptCompany
(
String
dept
Name
)
{
public
Boolean
selectExitDeptCompany
(
String
dept
Id
)
{
String
dn
=
baseMapper
.
selectExitDeptCompany
(
dept
Name
);
String
dn
=
baseMapper
.
selectExitDeptCompany
(
dept
Id
);
if
(
Common
.
isEmpty
(
dn
))
{
if
(
Common
.
isEmpty
(
dn
))
{
return
false
;
return
false
;
}
}
...
...
yifu-upms/yifu-upms-biz/src/main/resources/mapper/SysUserMapper.xml
View file @
de1b1a34
...
@@ -384,6 +384,6 @@
...
@@ -384,6 +384,6 @@
SELECT
SELECT
dept_dn
dept_dn
from
from
sys_dept where
name = #{deptName
} limit 1
sys_dept where
dept_id = #{deptId
} limit 1
</select>
</select>
</mapper>
</mapper>
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