Bladeren bron

Merge remote-tracking branch 'origin/master'

xs 5 jaren geleden
bovenliggende
commit
adadb3481c

+ 3 - 0
src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ProjectMapper.xml

@@ -47,6 +47,9 @@
 		FROM sg_wbs_project a
 		left join sys_user b on a.create_by = b.id
 		<where>
+		   <if test="createBy != null">
+				a.create_by = #{createBy.id} AND
+		   </if>
 		    <if test="projectId !=null and projectId != ''">
 				a.id = #{projectId} AND
 			</if>

+ 6 - 0
src/main/java/com/jeeplus/modules/sg/project/service/ProjectService.java

@@ -10,6 +10,8 @@ import com.jeeplus.modules.sg.project.entity.WbsProject;
 import com.jeeplus.modules.sg.project.entity.WbsSelection;
 import com.jeeplus.modules.sg.project.mapper.ItemMapper;
 import com.jeeplus.modules.sg.project.mapper.ProjectMapper;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +51,10 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
 
     public Page<WbsProject> findPage(Page<WbsProject> page, WbsProject wbsProject) {
         wbsProject.setPage(page);
+        User user = UserUtils.getUser();
+        if(!user.getId().equals("1")){
+            wbsProject.setCreateBy(user);
+        }
         List<WbsProject> list =  projectMapper.findList(wbsProject);
         long count = page.getCount();
         Integer pageNo = page.getPageNo();

+ 2 - 2
src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp

@@ -13,8 +13,8 @@
 	<script src="${ctxStatic}/plugin/js-menu/contabs.js"></script>
 	<link id="theme-tab" href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css" rel="stylesheet" />
 
-	<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%>
-	<%@ include file="/webpage/include/layIM-init.jsp"%>
+	<%--<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%>--%>
+	<%--<%@ include file="/webpage/include/layIM-init.jsp"%>--%>
 <style>
 	.push-right #sidebar-nav{
 	  display:block;

+ 2 - 2
src/main/webapp/webpage/modules/sys/login/sysIndex.jsp

@@ -10,8 +10,8 @@
 	<meta name="decorator" content="ani"/>
 	<script src="${ctxStatic}/plugin/js-menu/contabs.js"></script>
 	<link id="theme-tab" href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css" rel="stylesheet" />
-	<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%>
-	<%@ include file="/webpage/include/layIM-init.jsp"%>
+	<%--<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%>--%>
+	<%--<%@ include file="/webpage/include/layIM-init.jsp"%>--%>
 </head>
 
 <body class="">