Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-23 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a

 src/main/webapp/project_mng.xhtml

@@ -76,6 +76,10 @@
                   <!-- <h:outputText value="#{projectMngController.userIdNameMap.get(row.sysUserId)}"></h:outputText>-->
                    <h:outputText value="#{row.username}"></h:outputText>
                </p:column>
                <p:column headerText="课题组">
                    <!-- <h:outputText value="#{projectMngController.userIdNameMap.get(row.sysUserId)}"></h:outputText>-->
                    <h:outputText value="#{row.project}"></h:outputText>
                </p:column>
                <p:column headerText="备注">
                    <h:outputText value="#{row.remark}"></h:outputText>
                </p:column>
@@ -92,7 +96,7 @@
                        <p:outputLabel value="课题编号"></p:outputLabel>
                    </p:column>
                    <p:column>
                        <p:inputText value="#{projectMngController.sysProject.projectId}"></p:inputText>
                        <p:inputText value="#{projectMngController.sysProject.projectId}" required="true" requiredMessage="请填写课题编号"></p:inputText>
                    </p:column>
                </p:row>
                <p:row>
@@ -100,7 +104,7 @@
                        <p:outputLabel value="课题名称"></p:outputLabel>
                    </p:column>
                    <p:column>
                        <p:inputText value="#{projectMngController.sysProject.projectName}"></p:inputText>
                        <p:inputText value="#{projectMngController.sysProject.projectName}" required="true" requiredMessage="请填写课题名称"></p:inputText>
                    </p:column>
                </p:row>
                <p:row>
@@ -116,12 +120,19 @@
                                        itemValue="#{item.id}" forceSelection="true">
                            <p:ajax event="itemSelect" process="@this" update="@this" />
                            <p:column>
                                <h:outputText value="#{item.name}" />
                                <h:outputText value="#{item.name}" required="true" requiredMessage="请填写课题负责人"/>
                            </p:column>
                        </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="请选择负责人">