模块：实验室临时存储管理,用户管理,课题组 修改：课题组 提出：秦老师

gdg

2020-12-17 89f76477441ff2070b3ae963934d7b0d73c4f787

模块：实验室临时存储管理,用户管理,课题组
修改：课题组
提出：秦老师

 src/main/java/com/nanometer/smartlab/service/SysProjectServiceImpl.java

@@ -32,6 +32,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
public class SysProjectServiceImpl implements SysProjectService {
@@ -240,7 +241,7 @@

    @Override
    public List<SysProject> getAll() {
         return sysProjectDao.getSysProjectList(null);
         return sysProjectDao.getSysProjectList(null).stream().filter(project->project.getProject()!=null).collect(Collectors.toList());
    }

    @Override

 src/main/webapp/index.xhtml

@@ -95,12 +95,12 @@
            </h:form>
        </p:dialog>
        <script>
            // console.log($('#northForm\\:ischange').val())
            // if($('#northForm\\:ischange').val() == 0){
            //     $("#changePassword").hide();
            // }else {
            //     $("#changePassword").show();
            // }
            console.log($('#northForm\\:ischange').val())
            if($('#northForm\\:ischange').val() == 0){
                $("#changePassword").hide();
            }else {
                $("#changePassword").show();
            }
        </script>
    </ui:define>


 src/main/webapp/project_mng.xhtml

@@ -101,14 +101,6 @@
                </p:row>
                <p:row>
                    <p:column>
                        <p:outputLabel value="课题组"></p:outputLabel>
                    </p:column>
                    <p:column>
                        <p:inputText value="#{projectMngController.sysProject.project}"></p:inputText>
                    </p:column>
                </p:row>
                <p:row>
                    <p:column>
                        <p:outputLabel value="课题名称"></p:outputLabel>
                    </p:column>
                    <p:column>
@@ -133,7 +125,14 @@
                        </p:autoComplete>
                    </p:column>
                </p:row>

                <p:row>
                    <p:column>
                        <p:outputLabel value="课题组"></p:outputLabel>
                    </p:column>
                    <p:column>
                        <p:inputText value="#{projectMngController.sysProject.project}" required="true" requiredMessage="请填写课题组"></p:inputText>
                    </p:column>
                </p:row>

                <!--<p:selectOneMenu value="#{projectMngController.sysProject.sysUserId}"
                                 required="true" requiredMessage="请选择负责人">

 src/main/webapp/user_mng.xhtml

@@ -169,7 +169,7 @@
                <p:selectOneMenu value="#{userMngController.sysUser.projectId}">
                    <f:selectItem itemLabel="不选择课题组"  />
                    <f:selectItems value="#{sysProjectServiceImpl.getAll()}"
                                   var="item" itemLabel="#{item.projectName}" itemValue="#{item.id}"></f:selectItems>
                                   var="item" itemLabel="#{item.project}"  itemValue="#{item.id}"></f:selectItems>
                </p:selectOneMenu>

                <p:outputLabel value="姓名"></p:outputLabel>