Compare commits
No commits in common. "ea457a6604690709d63ab94af7487ec52acb17da" and "25e16c42649cf890761678ff1c825d65c34cc19a" have entirely different histories.
ea457a6604
...
25e16c4264
@ -65,9 +65,7 @@ public class ShiroConfiguration {
|
|||||||
filterChainDefinitionMap.put("/project/get", "anon"); // 信息接口允许匿名访问
|
filterChainDefinitionMap.put("/project/get", "anon"); // 信息接口允许匿名访问
|
||||||
filterChainDefinitionMap.put("/project/get/custom", "anon"); // 游客获取项目允许匿名访问
|
filterChainDefinitionMap.put("/project/get/custom", "anon"); // 游客获取项目允许匿名访问
|
||||||
filterChainDefinitionMap.put("/project/add", "anon"); // 信息接口允许匿名访问
|
filterChainDefinitionMap.put("/project/add", "anon"); // 信息接口允许匿名访问
|
||||||
filterChainDefinitionMap.put("/project/work/add", "anon"); // 信息接口允许匿名访问
|
|
||||||
filterChainDefinitionMap.put("/tags/project/list", "anon"); // 信息接口允许匿名访问
|
filterChainDefinitionMap.put("/tags/project/list", "anon"); // 信息接口允许匿名访问
|
||||||
filterChainDefinitionMap.put("/module/add", "anon"); // 信息接口允许匿名访问
|
|
||||||
filterChainDefinitionMap.put("/**/**", "authc"); // 其他接口一律拦截(需要Token)
|
filterChainDefinitionMap.put("/**/**", "authc"); // 其他接口一律拦截(需要Token)
|
||||||
|
|
||||||
|
|
||||||
|
@ -59,7 +59,6 @@ public class ProjectController {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 游客获取项目
|
* 游客获取项目
|
||||||
*
|
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/project/get/custom")
|
@GetMapping("/project/get/custom")
|
||||||
@ -211,7 +210,6 @@ public class ProjectController {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 子系统子模块的增加
|
* 子系统子模块的增加
|
||||||
*
|
|
||||||
* @param request
|
* @param request
|
||||||
* @param bindingResult
|
* @param bindingResult
|
||||||
* @return
|
* @return
|
||||||
|
@ -15,9 +15,9 @@ public interface ProjectMapper {
|
|||||||
|
|
||||||
@Insert("insert into organize_oa.oa_project " +
|
@Insert("insert into organize_oa.oa_project " +
|
||||||
"(name, description, principal_id, cycle,file,complete_time," +
|
"(name, description, principal_id, cycle,file,complete_time," +
|
||||||
"deadline,status,is_finish,tags) " +
|
"deadline,status,is_finish) " +
|
||||||
"value (#{name},#{description},#{principalId},#{cycle},#{file}" +
|
"value (#{name},#{description},#{principalId},#{cycle},#{file}" +
|
||||||
",#{completeTime},#{deadline},#{status},#{isFinish},#{tags})")
|
",#{completeTime},#{deadline},#{status},#{isFinish})")
|
||||||
void projectAdd(ProjectInfoVO projectAdd);
|
void projectAdd(ProjectInfoVO projectAdd);
|
||||||
|
|
||||||
@Insert("insert into organize_oa.oa_project_work (project_id, pid, name, principal_id," +
|
@Insert("insert into organize_oa.oa_project_work (project_id, pid, name, principal_id," +
|
||||||
|
@ -17,7 +17,6 @@ public class ProjectInfoVO {
|
|||||||
private String description;
|
private String description;
|
||||||
@NotNull(message = "周期不能为空")
|
@NotNull(message = "周期不能为空")
|
||||||
private Long cycle;
|
private Long cycle;
|
||||||
private String tags;
|
|
||||||
private String file;
|
private String file;
|
||||||
private Timestamp completeTime;
|
private Timestamp completeTime;
|
||||||
private Timestamp deadline;
|
private Timestamp deadline;
|
||||||
|
@ -37,7 +37,6 @@ public class ModuleServiceImpl implements ModuleService {
|
|||||||
//判断是否是项目负责人
|
//判断是否是项目负责人
|
||||||
int is = 1;
|
int is = 1;
|
||||||
if(!pid.equals(userId)){
|
if(!pid.equals(userId)){
|
||||||
log.info("不是负责人");
|
|
||||||
is = 0;
|
is = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,6 +50,7 @@ public class ProjectServiceImpl implements ProjectService {
|
|||||||
private final UserDAO userDAO;
|
private final UserDAO userDAO;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@CheckUserHasPermission("project.add")
|
||||||
public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) {
|
public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) {
|
||||||
log.info("\t> 执行 Service 层 ProjectService.projectAdd 方法");
|
log.info("\t> 执行 Service 层 ProjectService.projectAdd 方法");
|
||||||
projectDAO.projectAdd(projectAdd);
|
projectDAO.projectAdd(projectAdd);
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
<select id="getByProjectId" resultType="com.jsl.oa.model.doData.ProjectWorkDO">
|
<select id="getByProjectId" resultType="com.jsl.oa.model.doData.ProjectWorkDO">
|
||||||
select * from organize_oa.oa_project_work where project_id=#{projectId} and type=0
|
select * from organize_oa.oa_project_work where project_id=#{projectId} and type=0
|
||||||
<if test="is != 1 ">
|
<if test="is != 1 ">
|
||||||
and (principal_id=#{userId} or principal_id is null)
|
and principal_id=#{userId}
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user